Merge pull request #13309 from Kojoley/test-reqs

Python 3.11 fixes

.github/workflows/test.yml

@@ -16,12 +16,23 b' jobs:'
       matrix:
         os: [ubuntu-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10"]
+        deps: [test_extra]
         # Test all on ubuntu, test ends on macos
         include:
           - os: macos-latest
             python-version: "3.7"
+            deps: test_extra
           - os: macos-latest
             python-version: "3.10"
+            deps: test_extra
+          # Tests minimal dependencies set
+          - os: ubuntu-latest
+            python-version: "3.10"
+            deps: test
+          # Tests latest development Python version
+          - os: ubuntu-latest
+            python-version: "3.11-dev"
+            deps: test
 
     steps:
     - uses: actions/checkout@v2
@@ -30,15 +41,13 b' jobs:'
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install latex
-      if: runner.os == 'Linux'
+      if: runner.os == 'Linux' && matrix.deps == 'test_extra'
       run: sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
     - name: Install and update Python dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
-        python -m pip install --upgrade --upgrade-strategy eager trio curio 
-        python -m pip install --upgrade pytest pytest-cov pytest-trio 'matplotlib!=3.2.0' pandas
-        python -m pip install --upgrade check-manifest pytest-cov anyio
+        python -m pip install --upgrade -e .[${{ matrix.deps }}]
+        python -m pip install --upgrade check-manifest pytest-cov
     - name: Check manifest
       run: check-manifest
     - name: pytest

IPython/core/tests/test_completer.py

@@ -104,7 +104,7 b' def test_unicode_range():'
     assert len_exp == len_test, message
 
     # fail if new unicode symbols have been added. 
-    assert len_exp <= 137714, message
+    assert len_exp <= 138552, message
 
 
 @contextmanager
@@ -219,6 +219,11 b' class KeyCompletable:'
         return list(self.things)
 
 
[e-mail](
+    sys.version_info >= (3, 11),
+    reason="parso does not support 3.11 yet",
+    raises=NotImplementedError,
+)
 class TestCompleter(unittest.TestCase):
     def setUp(self):
         """
@@ -282,7 +287,7 b' class TestCompleter(unittest.TestCase):'
 
         ip = get_ipython()
         # Test some random unicode symbols
-        keys = random.sample(latex_symbols.keys(), 10)
+        keys = random.sample(sorted(latex_symbols), 10)
         for k in keys:
             text, matches = ip.complete(k)
             self.assertEqual(text, k)

IPython/core/tests/test_display.py

@@ -156,7 +156,6 b' def _get_inline_config():'
     return InlineBackend.instance()
 
 
[e-mail]_without("ipykernel")
 @dec.skip_without("matplotlib")
 def test_set_matplotlib_close():
     cfg = _get_inline_config()
@@ -196,7 +195,6 b' def test_set_matplotlib_formats():'
                 assert Figure not in f
 
 
[e-mail]_without("ipykernel")
 @dec.skip_without("matplotlib")
 def test_set_matplotlib_formats_kwargs():
     from matplotlib.figure import Figure

IPython/core/tests/test_inputsplitter.py

@@ -6,13 +6,13 b''
 # Distributed under the terms of the Modified BSD License.
 
 import unittest
+import pytest
 import sys
 
 from IPython.core import inputsplitter as isp
 from IPython.core.inputtransformer import InputTransformer
 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
 from IPython.testing import tools as tt
-from IPython.testing.decorators import skipif
 
 #-----------------------------------------------------------------------------
 # Semi-complete examples (also used as tests)
@@ -318,7 +318,12 b' class InputSplitterTestCase(unittest.TestCase):'
         self.isp.push(u'\xc3\xa9')
         self.isp.push(u"u'\xc3\xa9'")
 
-    @skipif(sys.version_info[:3] == (3, 9, 8))
+    @pytest.mark.xfail(
+        reason="Bug in python 3.9.8 – bpo 45738",
+        condition=sys.version_info in [(3, 9, 8, "final", 0), (3, 11, 0, "alpha", 2)],
+        raises=SystemError,
+        strict=True,
+    )
     def test_line_continuation(self):
         """ Test issue #2108."""
         isp = self.isp

IPython/core/tests/test_inputtransformer2.py

@@ -275,7 +275,8 b' examples = ['
         None,
         marks=pytest.mark.xfail(
             reason="Bug in python 3.9.8 – bpo 45738",
-            condition=sys.version_info[:3] == (3, 9, 8),
+            condition=sys.version_info
+            in [(3, 9, 8, "final", 0), (3, 11, 0, "alpha", 2)],
             raises=SystemError,
             strict=True,
         ),
@@ -292,7 +293,9 b' def test_check_complete_param(code, expected, number):'
 
 @pytest.mark.xfail(
     reason="Bug in python 3.9.8 – bpo 45738",
-    condition=sys.version_info[:3] == (3, 9, 8),
+    condition=sys.version_info in [(3, 9, 8, "final", 0), (3, 11, 0, "alpha", 2)],
+    raises=SystemError,
+    strict=True,
 )
 def test_check_complete():
     cc = ipt2.TransformerManager().check_complete

IPython/core/tests/test_magic.py

@@ -742,6 +742,7 b' def test_extension():'
 
 
 def test_notebook_export_json():
+    pytest.importorskip("nbformat")
     _ip = get_ipython()
     _ip.history_manager.reset()   # Clear any existing history.
     cmds = ["a=1", "def b():\n  return a**2", "print('noël, été', b())"]

IPython/core/tests/test_oinspect.py

@@ -269,7 +269,6 b' def test_empty_property_has_no_source():'
 
 
 def test_property_sources():
-    import posixpath
     # A simple adder whose source and signature stays
     # the same across Python distributions
     def simple_add(a, b):
@@ -283,7 +282,7 b' def test_property_sources():'
 
         foo = foo.setter(lambda self, v: setattr(self, 'bar', v))
 
-        dname = property(posixpath.dirname)
+        dname = property(oinspect.getdoc)
         adder = property(simple_add)
 
     i = inspector.info(A.foo, detail_level=1)
@@ -291,7 +290,7 b' def test_property_sources():'
     assert "lambda self, v:" in i["source"]
 
     i = inspector.info(A.dname, detail_level=1)
-    assert "def dirname(p)" in i["source"]
+    assert "def getdoc(obj)" in i["source"]
 
     i = inspector.info(A.adder, detail_level=1)
     assert "def simple_add(a, b)" in i["source"]

IPython/core/tests/test_run.py

@@ -381,6 +381,7 b' tclass.py: deleting object: C-third'
 
     def test_run_nb(self):
         """Test %run notebook.ipynb"""
+        pytest.importorskip("nbformat")
         from nbformat import v4, writes
         nb = v4.new_notebook(
            cells=[
@@ -397,6 +398,7 b' tclass.py: deleting object: C-third'
 
     def test_run_nb_error(self):
         """Test %run notebook.ipynb error"""
+        pytest.importorskip("nbformat")
         from nbformat import v4, writes
         # %run when a file name isn't provided
         pytest.raises(Exception, _ip.magic, "run")

IPython/lib/display.py

@@ -66,6 +66,9 b' class Audio(DisplayObject):'
     Examples
     --------
 
+    >>> import pytest
+    >>> np = pytest.importorskip("numpy")
+
     Generate a sound
 
     >>> import numpy as np

IPython/terminal/tests/test_help.py

@@ -3,6 +3,7 b''
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import pytest
 import IPython.testing.tools as tt
 
 
@@ -25,4 +26,5 b' def test_locate_profile_help():'
     tt.help_all_output_test("locate profile")
 
 def test_trust_help():
+    pytest.importorskip("nbformat")
     tt.help_all_output_test("trust")

appveyor.yml

@@ -31,8 +31,8 b' init:'
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
-  - pip install pytest pytest-cov pytest-trio matplotlib pandas
-  - pip install -e .[test]
+  - pip install pytest-cov
+  - pip install -e .[test_extra]
 test_script:
   - pytest --color=yes -ra --cov --cov-report=xml
 on_finish:

setup.py

@@ -176,12 +176,19 b' extras_require = dict('
     doc=["Sphinx>=1.3"],
     test=[
         "pytest",
-        "requests",
         "testpath",
         "pygments",
+    ],
+    test_extra=[
+        "pytest",
+        "testpath",
+        "curio",
+        "matplotlib!=3.2.0",
         "nbformat",
-        "ipykernel",
         "numpy>=1.17",
+        "pandas",
+        "pygments",
+        "trio",
     ],
     terminal=[],
     kernel=["ipykernel"],