Move optional dependencies to a separate set

Kojoley · Kojoley · commit eac76a508587 · 2021-11-21T01:42:24.000+03:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,12 +16,19 @@ 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
 
     steps:
     - uses: actions/checkout@v2
@@ -30,15 +37,13 @@ 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
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
@@ -742,6 +742,7 @@ 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())"]
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
@@ -381,6 +381,7 @@ def test_ignore_sys_exit(self):
 
     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 @@ def test_run_nb(self):
 
     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")
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
@@ -66,6 +66,9 @@ class Audio(DisplayObject):
     Examples
     --------
 
+    >>> import pytest
+    >>> np = pytest.importorskip("numpy")
+
     Generate a sound
 
     >>> import numpy as np
diff --git a/IPython/terminal/tests/test_help.py b/IPython/terminal/tests/test_help.py
@@ -3,6 +3,7 @@
 # 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 @@ 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")
diff --git a/appveyor.yml b/appveyor.yml
@@ -31,8 +31,8 @@ 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:
diff --git a/setup.py b/setup.py
@@ -178,9 +178,18 @@
         "pytest",
         "testpath",
         "pygments",
+    ],
+    test_extra=[
+        "pytest",
+        "testpath",
+        "curio",
+        "matplotlib!=3.2.0",
         "nbformat",
         "ipykernel",
         "numpy>=1.17",
+        "pandas",
+        "pygments",
+        "trio",
     ],
     terminal=[],
     kernel=["ipykernel"],
