diff --git a/.travis.yml b/.travis.yml index 724a99b..b97f05c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: - 3.6 - 3.5 - 3.4 - - 3.3 sudo: false env: global: diff --git a/IPython/__init__.py b/IPython/__init__.py index d3a5d63..f1fb3bf 100644 --- a/IPython/__init__.py +++ b/IPython/__init__.py @@ -27,12 +27,12 @@ import sys #----------------------------------------------------------------------------- # Don't forget to also update setup.py when this changes! -if sys.version_info < (3,3): +if sys.version_info < (3,4): raise ImportError( """ -IPython 6.0+ does not support Python 2.6, 2.7, 3.0, 3.1, or 3.2. +IPython 6.3+ supports Python 3.4 and above. When using Python 2.7, please install IPython 5.x LTS Long Term Support version. -Beginning with IPython 6.0, Python 3.3 and above is required. +Python 3.3 was supported up to IPython 6.2. See IPython `README.rst` file for more information: diff --git a/setup.py b/setup.py index 78f4830..c9ff7eb 100755 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ import sys # # This check is also made in IPython/__init__, don't forget to update both when # changing Python version requirements. -if sys.version_info < (3, 3): +if sys.version_info < (3, 4): pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.' try: import pip @@ -175,7 +175,7 @@ extras_require = dict( parallel = ['ipyparallel'], qtconsole = ['qtconsole'], doc = ['Sphinx>=1.3'], - test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel'], + test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy'], terminal = [], kernel = ['ipykernel'], nbformat = ['nbformat'], @@ -200,8 +200,6 @@ install_requires = [ # but requires pip >= 6. pip < 6 ignores these. extras_require.update({ - 'test:python_version >= "3.4"': ['numpy'], - ':python_version == "3.3"': ['pathlib2'], ':python_version <= "3.4"': ['typing'], ':sys_platform != "win32"': ['pexpect'], ':sys_platform == "darwin"': ['appnope'], @@ -232,7 +230,7 @@ for key, deps in extras_require.items(): extras_require['all'] = everything if 'setuptools' in sys.modules: - setuptools_extra_args['python_requires'] = '>=3.3' + setuptools_extra_args['python_requires'] = '>=3.4' setuptools_extra_args['zip_safe'] = False setuptools_extra_args['entry_points'] = { 'console_scripts': find_entry_points(),