##// END OF EJS Templates
Merge pull request #12421 from meeseeksmachine/auto-backport-of-pr-12410-on-7.x
Matthias Bussonnier -
r25879:ff599326 merge
parent child Browse files
Show More
@@ -36,6 +36,11 b' before_install:'
36 install:
36 install:
37 - pip install pip --upgrade
37 - pip install pip --upgrade
38 - pip install setuptools --upgrade
38 - pip install setuptools --upgrade
39 - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
40 echo "for the tiem being still test on 3.6";
41 sed -i bkp s/7/6/g setup.py;
42 git diff;
43 fi
39 - pip install -e file://$PWD#egg=ipython[test] --upgrade
44 - pip install -e file://$PWD#egg=ipython[test] --upgrade
40 - pip install trio curio --upgrade --upgrade-strategy eager
45 - pip install trio curio --upgrade --upgrade-strategy eager
41 - pip install pytest 'matplotlib !=3.2.0' mypy
46 - pip install pytest 'matplotlib !=3.2.0' mypy
@@ -26,7 +26,7 b' import sys'
26 #
26 #
27 # This check is also made in IPython/__init__, don't forget to update both when
27 # This check is also made in IPython/__init__, don't forget to update both when
28 # changing Python version requirements.
28 # changing Python version requirements.
29 if sys.version_info < (3, 6):
29 if sys.version_info < (3, 7):
30 pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
30 pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
31 try:
31 try:
32 import pip
32 import pip
@@ -42,10 +42,11 b' if sys.version_info < (3, 6):'
42
42
43
43
44 error = """
44 error = """
45 IPython 7.10+ supports Python 3.6 and above, following NEP 29.
45 IPython 7.17+ supports Python 3.7 and above, following NEP 29.
46 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
46 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
47 Python 3.3 and 3.4 were supported up to IPython 6.x.
47 Python 3.3 and 3.4 were supported up to IPython 6.x.
48 Python 3.5 was supported with IPython 7.0 to 7.9.
48 Python 3.5 was supported with IPython 7.0 to 7.9.
49 Python 3.6 was supported with IPython up to 7.16.
49
50
50 See IPython `README.rst` file for more information:
51 See IPython `README.rst` file for more information:
51
52
@@ -228,7 +229,7 b' for key, deps in extras_require.items():'
228 extras_require['all'] = list(sorted(everything))
229 extras_require['all'] = list(sorted(everything))
229
230
230 if 'setuptools' in sys.modules:
231 if 'setuptools' in sys.modules:
231 setuptools_extra_args['python_requires'] = '>=3.6'
232 setuptools_extra_args['python_requires'] = '>=3.7'
232 setuptools_extra_args['zip_safe'] = False
233 setuptools_extra_args['zip_safe'] = False
233 setuptools_extra_args['entry_points'] = {
234 setuptools_extra_args['entry_points'] = {
234 'console_scripts': find_entry_points(),
235 'console_scripts': find_entry_points(),
General Comments 0
You need to be logged in to leave comments. Login now