Merge branch 'master' into feature/changelog-for-4.6.3

hodgestar · Feb 8, 2022 · 86395b3 · 86395b3
2 parents 31d119f + df48ed8
commit 86395b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -104,9 +104,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     env:
-      # Set up wheels matrix.  This is CPython 3.6--3.9 for all OS targets.
-      CIBW_BUILD: "cp3{6,7,8,9}-*"
-      CIBW_SKIP: "*-musllinux*"
+      # Set up wheels matrix.  This is CPython 3.6--3.10 for all OS targets.
+      CIBW_BUILD: "cp3{6,7,8,9,10}-*"
+      # Numpy and SciPy do not supply wheels for i686 for Python 3.10, so we
+      # skip those too:
+      CIBW_SKIP: "*-musllinux* cp310-manylinux_i686 cp310-win32"
       OVERRIDE_VERSION: ${{ github.event.inputs.override_version }}
 
     steps:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -69,11 +69,13 @@ jobs:
           # Ignore ImportWarning because pyximport registered an importer
           # PyxImporter that does not have a find_spec method and this raises
           # a warning on Python 3.10
+          # Ignore DeprecationWarnings raised by importing scipy.sparse.X
+          # under SciPy 1.8.0+.
           - case-name: Python 3.10
             os: ubuntu-latest
             python-version: "3.10"
             condaforge: 1
-            pytest-extra-options: "-W ignore::ImportWarning"
+            pytest-extra-options: "-W ignore::ImportWarning -W ignore::DeprecationWarning:qutip.fastsparse -W ignore::DeprecationWarning:cvxpy.interface.scipy_wrapper"
 
     steps:
       - uses: actions/checkout@v2
@@ -108,7 +110,7 @@ jobs:
           fi
           python -m pip install -e .[$QUTIP_TARGET]
           python -m pip install coverage==6.2
-          python -m pip install pytest-cov coveralls
+          python -m pip install pytest-cov coveralls pytest-timeout
 
       - name: Package information
         run: |
@@ -136,7 +138,7 @@ jobs:
             # truly being executed.
             export QUTIP_NUM_PROCESSES=2
           fi
-          pytest -Werror --strict-config --strict-markers --durations=0 --durations-min=1.0 --verbosity=1 --cov=qutip --cov-report= --color=yes ${{ matrix.pytest-extra-options }} qutip/tests
+          pytest -Werror --strict-config --strict-markers --timeout=300 --durations=0 --durations-min=1.0 --verbosity=1 --cov=qutip --cov-report= --color=yes ${{ matrix.pytest-extra-options }} qutip/tests
           # Above flags are:
           #  -Werror
           #     treat warnings as errors
@@ -145,6 +147,8 @@ jobs:
           #  --strict-markers
           #     error out if a marker is used but not defined in the
           #     configuration file
+          #  --timeout=300
+          #     error any individual test that goes longer than the given time
           #  --durations=0 --durations-min=1.0
           #     at the end, show a list of all the tests that took longer than a
           #     second to run