Merge pull request #203 from carlodri/entry_points

Switch to entry_points for scripts

Author: Juan Luis Cano Rodríguez

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"

README.rst

@@ -18,6 +18,9 @@ To install through easy_install or pip::
 
     $ easy_install -U memory_profiler # pip install -U memory_profiler
 
+The package is also available on `conda-forge
+<https://github.com/conda-forge/memory_profiler-feedstock>`_.
+
 To install from source, download the package, extract and type::
 
     $ python setup.py install

mprof.bat

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import glob
 import os
 import os.path as osp
@@ -465,7 +463,7 @@ def xlim_type(value):
                         help="Save plot to file instead of displaying it.")
     parser.add_argument("--window", "-w", dest="xlim", type=xlim_type,
                         help="Plot a time-subset of the data. E.g. to plot between 0 and 20.5 seconds: --window 0,20.5")
-    parser.add_argument("--backend", 
+    parser.add_argument("--backend",
                       help="Specify the Matplotlib backend to use")
     parser.add_argument("profiles", nargs="*",
                         help="profiles made by mprof run")
@@ -540,8 +538,7 @@ def xlim_type(value):
     else:
         pl.show()
 
-
-if __name__ == "__main__":
+def main():
     # Workaround for optparse limitation: insert -- before first negative
     # number found.
     negint = re.compile("-[0-9]+")
@@ -555,3 +552,6 @@ def xlim_type(value):
                "run": run_action,
                "plot": plot_action}
     actions[get_action()]()
+
+if __name__ == "__main__":
+    main()

mprof mprof.pymprof renamed to mprof.py

@@ -1,7 +1,6 @@
 import os
 import io
 import re
-import sys
 from setuptools import setup
 
 
@@ -40,10 +39,6 @@ def find_version(*file_paths):
 
 """
 
-scripts = ['mprof']
-if sys.platform == "win32":
-    scripts.append('mprof.bat')
-
 setup(
     name='memory_profiler',
     description='A module for monitoring memory usage of a python program',
@@ -52,8 +47,10 @@ def find_version(*file_paths):
     author='Fabian Pedregosa',
     author_email='f@bianp.net',
     url='http://pypi.python.org/pypi/memory_profiler',
-    py_modules=['memory_profiler'],
-    scripts=scripts,
+    py_modules=['memory_profiler', 'mprof'],
+    entry_points={
+        'console_scripts' : ['mprof = mprof:main'],
+    },
     install_requires=['psutil'],
     classifiers=[_f for _f in CLASSIFIERS.split('\n') if _f],
     license='BSD'