Permalink
Browse files

Update version to 2.0, include IPython >=0.13 as a hard dependency, a…

…dd brett.olsen@gmail.com as maintainer
  • Loading branch information...
Brett Olsen
Brett Olsen committed Oct 20, 2016
1 parent 482772a commit fcdba72ed5f8b62ef86b6bdcf9ef856575032c9f
Showing with 15 additions and 13 deletions.
  1. +1 −0 .travis.yml
  2. +4 −0 README.rst
  3. +1 −0 dev_requirements.txt
  4. +3 −12 line_profiler.py
  5. +6 −1 setup.py
View
@@ -11,4 +11,5 @@ script:
- python -m unittest discover -v tests
notifications:
email:
+ - brett.olsen+travis-ci@gmail.com
- robert.kern+travis-ci@gmail.com
View
@@ -355,6 +355,10 @@ Bugs and pull requested can be submitted on GitHub_.
Changes
=======
+2.0
+~~~
+* BUG: Added support for IPython 5.0+, removed support for IPython <=0.12
+
1.1
~~~
* BUG: Read source files as bytes.
View
@@ -1 +1,2 @@
Cython
+IPython>=0.13
View
@@ -18,6 +18,9 @@
import sys
from IPython.core.magic import (Magics, magics_class, line_magic)
+from IPython.core.page import page
+from IPython.utils.ipstruct import Struct
+from IPython.core.error import UsageError
from _line_profiler import LineProfiler as CLineProfiler
@@ -269,18 +272,6 @@ def lprun(self, parameter_s=''):
-s: strip out all entries from the print-out that have zeros.
"""
- # Local imports to avoid hard dependency.
- from distutils.version import LooseVersion
- import IPython
- ipython_version = LooseVersion(IPython.__version__)
- if ipython_version < '0.11':
- from IPython.genutils import page
- from IPython.ipstruct import Struct
- from IPython.ipapi import UsageError
- else:
- from IPython.core.page import page
- from IPython.utils.ipstruct import Struct
- from IPython.core.error import UsageError
# Escape quote markers.
opts_def = Struct(D=[''], T=[''], f=[], m=[])
View
@@ -35,19 +35,21 @@
setup(
name = 'line_profiler',
- version = '1.0',
+ version = '2.0',
author = 'Robert Kern',
author_email = 'robert.kern@enthought.com',
description = 'Line-by-line profiler.',
long_description = long_description,
url = 'https://github.com/rkern/line_profiler',
+ download_url = 'https://github.com/rkern/line_profiler/tarball/2.0',
ext_modules = [
Extension('_line_profiler',
sources=[line_profiler_source, 'timers.c', 'unset_trace.c'],
depends=['python25.pxd'],
),
],
license = "BSD",
+ keywords = ['timing', 'timer', 'profiling', 'profiler', 'line_profiler'],
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
@@ -70,5 +72,8 @@
'kernprof=kernprof:main',
],
},
+ install_requires = [
+ 'IPython>=0.13',
+ ],
cmdclass = cmdclass,
)

0 comments on commit fcdba72

Please sign in to comment.