From ff599326dc95420250de79733f83523be5304954 2020-07-06 15:27:53
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2020-07-06 15:27:53
Subject: [PATCH] Merge pull request #12421 from meeseeksmachine/auto-backport-of-pr-12410-on-7.x


---

diff --git a/.travis.yml b/.travis.yml
index 00c5e3f..11779fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,11 @@ before_install:
 install:
   - pip install pip --upgrade
   - pip install setuptools --upgrade
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
+      echo "for the tiem being still test on 3.6";
+      sed -i bkp s/7/6/g setup.py;
+      git diff;
+    fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install pytest 'matplotlib !=3.2.0' mypy
diff --git a/setup.py b/setup.py
index daf5f55..7237450 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, 6):
+if sys.version_info < (3, 7):
     pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
     try:
         import pip
@@ -42,10 +42,11 @@ if sys.version_info < (3, 6):
 
 
     error = """
-IPython 7.10+ supports Python 3.6 and above, following NEP 29.
+IPython 7.17+ supports Python 3.7 and above, following NEP 29.
 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
 Python 3.3 and 3.4 were supported up to IPython 6.x.
 Python 3.5 was supported with IPython 7.0 to 7.9.
+Python 3.6 was supported with IPython up to 7.16.
 
 See IPython `README.rst` file for more information:
 
@@ -228,7 +229,7 @@ for key, deps in extras_require.items():
 extras_require['all'] = list(sorted(everything))
 
 if 'setuptools' in sys.modules:
-    setuptools_extra_args['python_requires'] = '>=3.6'
+    setuptools_extra_args['python_requires'] = '>=3.7'
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {
         'console_scripts': find_entry_points(),