diff -Nru ipdb-0.10.3/debian/changelog ipdb-0.11/debian/changelog --- ipdb-0.10.3/debian/changelog 2018-01-18 17:41:43.000000000 +0000 +++ ipdb-0.11/debian/changelog 2019-01-26 11:28:28.000000000 +0000 @@ -1,3 +1,17 @@ +ipdb (0.11-1) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org + + [ Andrey Rahmatullin ] + * New upstream version + * Switch to the debhelper compat level 12 + * Replace debian/compat with B-D: debhelper-compat + * Bump Standards-Version to 4.3.0 (no change needed) + * Make B-D on python-all unversioned + + -- Andrey Rahmatullin Sat, 26 Jan 2019 16:28:28 +0500 + ipdb (0.10.3-1) unstable; urgency=medium * New upstream version (Closes: #887096) diff -Nru ipdb-0.10.3/debian/compat ipdb-0.11/debian/compat --- ipdb-0.10.3/debian/compat 2018-01-18 17:41:43.000000000 +0000 +++ ipdb-0.11/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru ipdb-0.10.3/debian/control ipdb-0.11/debian/control --- ipdb-0.10.3/debian/control 2018-01-18 17:41:43.000000000 +0000 +++ ipdb-0.11/debian/control 2019-01-26 11:28:28.000000000 +0000 @@ -3,12 +3,12 @@ Priority: optional Maintainer: Debian Python Modules Team Uploaders: Andrey Rahmatullin -Build-Depends: debhelper (>= 11), dh-python, python-all (>= 2.6.6-3~), python3-all, +Build-Depends: debhelper-compat (= 12), dh-python, python-all, python3-all, python-setuptools, python3-setuptools, ipython, ipython3 -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Homepage: https://github.com/gotcha/ipdb -Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/ipdb.git -Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/ipdb.git +Vcs-Git: https://salsa.debian.org/python-team/modules/ipdb.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/ipdb Rules-Requires-Root: no Package: python-ipdb diff -Nru ipdb-0.10.3/HISTORY.txt ipdb-0.11/HISTORY.txt --- ipdb-0.10.3/HISTORY.txt 2017-04-22 09:30:53.000000000 +0000 +++ ipdb-0.11/HISTORY.txt 2018-02-15 11:43:41.000000000 +0000 @@ -1,6 +1,15 @@ Changelog ========= +0.11 (2018-02-15) +----------------- + +- Simplify loading IPython and getting information from it. + Drop support for python 2.6 + Drop support for IPython < 5.0.0 + [takluyver] + + 0.10.3 (2017-04-22) ------------------- diff -Nru ipdb-0.10.3/ipdb/__main__.py ipdb-0.11/ipdb/__main__.py --- ipdb-0.10.3/ipdb/__main__.py 2017-04-22 09:30:53.000000000 +0000 +++ ipdb-0.11/ipdb/__main__.py 2018-02-15 11:43:41.000000000 +0000 @@ -10,74 +10,44 @@ from contextlib import contextmanager +__version__= "0.10.3" -def import_module(possible_modules, needed_module): - """Make it more resilient to different versions of IPython and try to - find a module.""" - count = len(possible_modules) - for module in possible_modules: - try: - return __import__(module, fromlist=[needed_module]) - except ImportError: - count -= 1 - if count == 0: - raise -try: - # IPython 5.0 and newer - from IPython.terminal.debugger import TerminalPdb as Pdb - from IPython.core.debugger import BdbQuit_excepthook - from IPython.terminal.interactiveshell import TerminalInteractiveShell - # Let IPython decide about which debugger class to use - # This is especially important for tools that fiddle with stdout - debugger_cls = TerminalInteractiveShell().debugger_cls -except ImportError: - from IPython.core.debugger import Pdb, BdbQuit_excepthook - debugger_cls = Pdb - -possible_modules = ['IPython.terminal.ipapp', # Newer IPython - 'IPython.frontend.terminal.ipapp'] # Older IPython - -app = import_module(possible_modules, "TerminalIPythonApp") -TerminalIPythonApp = app.TerminalIPythonApp - -possible_modules = ['IPython.terminal.embed', # Newer IPython - 'IPython.frontend.terminal.embed'] # Older IPython -embed = import_module(possible_modules, "InteractiveShellEmbed") -InteractiveShellEmbed = embed.InteractiveShellEmbed -try: - get_ipython -except NameError: +from IPython import get_ipython +from IPython.core.debugger import BdbQuit_excepthook +from IPython.terminal.ipapp import TerminalIPythonApp +from IPython.terminal.embed import InteractiveShellEmbed + + +shell = get_ipython() +if shell is None: + # Not inside IPython # Build a terminal app in order to force ipython to load the # configuration ipapp = TerminalIPythonApp() # Avoid output (banner, prints) ipapp.interact = False ipapp.initialize([]) - def_colors = ipapp.shell.colors + shell = ipapp.shell else: - # If an instance of IPython is already running try to get an instance - # of the application. If there is no TerminalIPythonApp instanciated - # the instance method will create a new one without loading the config. - # i.e: if we are in an embed instance we do not want to load the config. - ipapp = TerminalIPythonApp.instance() - shell = get_ipython() - def_colors = shell.colors + # Running inside IPython # Detect if embed shell or not and display a message if isinstance(shell, InteractiveShellEmbed): - shell.write_err( + sys.stderr.write( "\nYou are currently into an embedded ipython shell,\n" "the configuration will not be loaded.\n\n" ) -def_exec_lines = [line + '\n' for line in ipapp.exec_lines] +# Let IPython decide about which debugger class to use +# This is especially important for tools that fiddle with stdout +debugger_cls = shell.debugger_cls +def_colors = shell.colors def _init_pdb(context=3, commands=[]): try: p = debugger_cls(def_colors, context=context) except TypeError: p = debugger_cls(def_colors) - p.rcLines += def_exec_lines p.rcLines.extend(commands) return p @@ -150,7 +120,8 @@ To let the script run until an exception occurs, use "-c continue". To let the script run up to a given line X in the debugged file, use -"-c 'until X'".""" +"-c 'until X'" +ipdb version %s.""" % __version__ def main(): diff -Nru ipdb-0.10.3/ipdb.egg-info/PKG-INFO ipdb-0.11/ipdb.egg-info/PKG-INFO --- ipdb-0.10.3/ipdb.egg-info/PKG-INFO 2017-04-22 09:30:53.000000000 +0000 +++ ipdb-0.11/ipdb.egg-info/PKG-INFO 2018-02-15 11:43:41.000000000 +0000 @@ -1,11 +1,12 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: ipdb -Version: 0.10.3 +Version: 0.11 Summary: IPython-enabled pdb Home-page: https://github.com/gotcha/ipdb Author: Godefroid Chapelle Author-email: gotcha@bubblenet.be License: BSD +Description-Content-Type: UNKNOWN Description: IPython `pdb` ============= @@ -135,6 +136,15 @@ Changelog ========= + 0.11 (2018-02-15) + ----------------- + + - Simplify loading IPython and getting information from it. + Drop support for python 2.6 + Drop support for IPython < 5.0.0 + [takluyver] + + 0.10.3 (2017-04-22) ------------------- @@ -362,10 +372,8 @@ Keywords: pdb ipython Platform: UNKNOWN -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 @@ -373,3 +381,4 @@ Classifier: Operating System :: POSIX :: Linux Classifier: Operating System :: Microsoft :: Windows Classifier: Topic :: Software Development :: Debuggers +Requires-Python: >=2.7 diff -Nru ipdb-0.10.3/ipdb.egg-info/requires.txt ipdb-0.11/ipdb.egg-info/requires.txt --- ipdb-0.10.3/ipdb.egg-info/requires.txt 2017-04-22 09:30:53.000000000 +0000 +++ ipdb-0.11/ipdb.egg-info/requires.txt 2018-02-15 11:43:41.000000000 +0000 @@ -1,10 +1,7 @@ setuptools -[:python_version == "2.6"] -ipython >= 0.10.2, < 2.0.0 - [:python_version == "2.7"] -ipython >= 0.10.2, < 6.0.0 +ipython<6.0.0,>=5.0.0 [:python_version >= "3.3"] -ipython >= 0.10.2 +ipython>=5.0.0 diff -Nru ipdb-0.10.3/PKG-INFO ipdb-0.11/PKG-INFO --- ipdb-0.10.3/PKG-INFO 2017-04-22 09:30:53.000000000 +0000 +++ ipdb-0.11/PKG-INFO 2018-02-15 11:43:41.000000000 +0000 @@ -1,11 +1,12 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: ipdb -Version: 0.10.3 +Version: 0.11 Summary: IPython-enabled pdb Home-page: https://github.com/gotcha/ipdb Author: Godefroid Chapelle Author-email: gotcha@bubblenet.be License: BSD +Description-Content-Type: UNKNOWN Description: IPython `pdb` ============= @@ -135,6 +136,15 @@ Changelog ========= + 0.11 (2018-02-15) + ----------------- + + - Simplify loading IPython and getting information from it. + Drop support for python 2.6 + Drop support for IPython < 5.0.0 + [takluyver] + + 0.10.3 (2017-04-22) ------------------- @@ -362,10 +372,8 @@ Keywords: pdb ipython Platform: UNKNOWN -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 @@ -373,3 +381,4 @@ Classifier: Operating System :: POSIX :: Linux Classifier: Operating System :: Microsoft :: Windows Classifier: Topic :: Software Development :: Debuggers +Requires-Python: >=2.7 diff -Nru ipdb-0.10.3/setup.cfg ipdb-0.11/setup.cfg --- ipdb-0.10.3/setup.cfg 2017-04-22 09:30:53.000000000 +0000 +++ ipdb-0.11/setup.cfg 2018-02-15 11:43:41.000000000 +0000 @@ -6,5 +6,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -Nru ipdb-0.10.3/setup.py ipdb-0.11/setup.py --- ipdb-0.10.3/setup.py 2017-04-22 09:30:53.000000000 +0000 +++ ipdb-0.11/setup.py 2018-02-15 11:43:41.000000000 +0000 @@ -7,7 +7,7 @@ from setuptools import setup, find_packages from sys import version_info -version = '0.10.3' +version = '0.11' long_description = (open('README.rst').read() + '\n\n' + open('HISTORY.txt').read()) @@ -24,10 +24,8 @@ description="IPython-enabled pdb", long_description=long_description, classifiers=[ - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', @@ -45,14 +43,14 @@ include_package_data=True, zip_safe=True, test_suite='tests', + python_requires=">=2.7", install_requires=[ 'setuptools' ], extras_require={ - ':python_version == "2.6"': ['ipython >= 0.10.2, < 2.0.0'], - ':python_version == "2.7"': ['ipython >= 0.10.2, < 6.0.0'], + ':python_version == "2.7"': ['ipython >= 5.0.0, < 6.0.0'], # No support for python 3.0, 3.1, 3.2. - ':python_version >= "3.3"': ['ipython >= 0.10.2'], + ':python_version >= "3.3"': ['ipython >= 5.0.0'], }, entry_points={ 'console_scripts': ['%s = ipdb.__main__:main' % console_script]