From 24ed0b8823ae45db61076ee2460179fbcf534a69 2020-08-28 19:15:38
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2020-08-28 19:15:38
Subject: [PATCH] Backport PR #12514: prepare release notes

---

diff --git a/.travis.yml b/.travis.yml
index a2e3dca..34d0cd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,8 +37,8 @@ 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;
+      echo "for the time being still test on 3.6";
+      sed -ibkp s/7/6/g setup.py;
       git diff;
     fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index 376d891..1a01c65 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -154,7 +154,7 @@ class PylabMagics(Magics):
 
         gui, backend, clobbered = self.shell.enable_pylab(args.gui, import_all=import_all)
         self._show_matplotlib_backend(args.gui, backend)
-        print ("Populating the interactive namespace from numpy and matplotlib")
+        print("Populating the interactive namespace from numpy and matplotlib")
         if clobbered:
             warn("pylab import has clobbered these variables: %s"  % clobbered +
             "\n`%matplotlib` prevents importing * from pylab and numpy"
diff --git a/README.rst b/README.rst
index 9c0c89e..9400476 100644
--- a/README.rst
+++ b/README.rst
@@ -29,6 +29,8 @@ contribute to the project.
 
 Starting with IPython 7.10, IPython follows `NEP 29 <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_
 
+**IPython 7.17+** requires Python version 3.7 and above.
+
 **IPython 7.10+** requires Python version 3.6 and above.
 
 **IPython 7.0** requires Python version 3.5 and above.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 68a1c5d..8896113 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,21 @@
  7.x Series
 ============
 
+.. _version 718:
+
+IPython 7.18
+============
+
+IPython 7.18 is a minor release that mostly contains bugfixes.
+
+ - ``CRLF`` is now handled by magics my default; solving some issues due to copy
+   pasting on windows. :ghpull:`12475`
+
+ - Requirin pexpect ``>=4.3`` as we are Python 3.7+ only and earlier version of
+   pexpect will be incompatible. :ghpull:`12510`
+
+
+
 .. _version 717:
 
 IPython 7.17