From c73130885aa2b64e7e7c95c6951fe88823f1323b 2018-04-02 10:58:30
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: 2018-04-02 10:58:30
Subject: [PATCH] Update version numbers for Python support

---

diff --git a/IPython/__init__.py b/IPython/__init__.py
index f1fb3bf..5e81082 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -30,9 +30,9 @@ import sys
 if sys.version_info < (3,4):
     raise ImportError(
 """
-IPython 6.3+ supports Python 3.4 and above.
+IPython 7.0+ supports Python 3.4 and above.
 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
-Python 3.3 was supported up to IPython 6.2.
+Python 3.3 was supported up to IPython 6.x.
 
 See IPython `README.rst` file for more information:
 
diff --git a/README.rst b/README.rst
index b78dbfb..76b916d 100644
--- a/README.rst
+++ b/README.rst
@@ -23,9 +23,9 @@ contribute to the project.
 
 **IPython versions and Python Support**
 
-**IPython 6.3** requires Python version 3.4 and above.
+**IPython 7.0** requires Python version 3.4 and above.
 
-**IPython 6.0-6.2** requires Python version 3.3 and above.
+**IPython 6.x** requires Python version 3.3 and above.
 
 **IPython 5.x LTS** is the compatible release for Python 2.7.
 If you require Python 2 support, you **must** use IPython 5.x LTS. Please
diff --git a/docs/source/overview.rst b/docs/source/overview.rst
index c4b7e06..de36e6a 100644
--- a/docs/source/overview.rst
+++ b/docs/source/overview.rst
@@ -239,8 +239,8 @@ This functionality is optional and now part of the `ipyparallel
 Portability and Python requirements
 -----------------------------------
 
-Version 6.3+ supports Python 3.4 and higher.
-Versions 6.0 to 6.2 support Python 3.3 and higher.
+Version 7.0+ supports Python 3.4 and higher.
+Versions 6.x support Python 3.3 and higher.
 Versions 2.0 to 5.x work with Python 2.7.x releases and Python 3.3 and higher.
 Version 1.0 additionally worked with Python 2.6 and 3.2.
 Version 0.12 was the first version to fully support Python 3.
diff --git a/setup.py b/setup.py
index 6b5c958..2c8aca8 100755
--- a/setup.py
+++ b/setup.py
@@ -42,9 +42,9 @@ if sys.version_info < (3, 4):
 
 
     error = """
-IPython 6.3+ supports Python 3.4 and above.
+IPython 7.0+ supports Python 3.4 and above.
 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
-Python 3.3 was supported up to IPython 6.2.
+Python 3.3 was supported up to IPython 6.x.
 
 See IPython `README.rst` file for more information: