Skip to content

Commit

Permalink
Merge pull request #2383 from Ericgig/misc.scipy13
Browse files Browse the repository at this point in the history
Set requirements to refuse scipy 1.13
  • Loading branch information
Ericgig committed Apr 4, 2024
2 parents b56ed74 + da54808 commit 50081e5
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
29 changes: 21 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# matrix size; make sure to test all supported versions in some form.
python-version: ["3.9"]
case-name: [defaults]
numpy-requirement: [">=1.20,<1.21"]
numpy-requirement: [">=1.20"]
coverage-requirement: ["==6.5"]
# Extra special cases. In these, the new variable defined should always
# be a truth-y value (hence 'nomkl: 1' rather than 'mkl: 0'), because
Expand Down Expand Up @@ -68,6 +68,7 @@ jobs:
python-version: "3.9"
numpy-requirement: ">=1.20,<1.21"
openmp: 1
oldmatplotlib: 1 # Recent matplotlib don't work with numpy 1.20

# Builds without Cython at runtime. This is a core feature;
# everything should be able to run this.
Expand Down Expand Up @@ -143,13 +144,23 @@ jobs:
# In the run, first we handle any special cases. We do this in bash
# rather than in the GitHub Actions file directly, because bash gives us
# a proper programming language to use.
# We install without build isolation so qutip is compiled with the
# version of cython, scipy, numpy in the test matrix, not a temporary
# version use in the installation virtual environment.
run: |
QUTIP_TARGET="tests,graphics,ipython"
if [[ -z "${{ matrix.nocython }}" ]]; then
QUTIP_TARGET="$QUTIP_TARGET,runtime_compilation"
# Install the extra requirement
python -m pip install pytest>=5.2 pytest-rerunfailures # tests
python -m pip install matplotlib # graphics
python -m pip install ipython # ipython
python -m pip install "coverage${{ matrix.coverage-requirement }}" chardet
python -m pip install pytest-cov coveralls pytest-fail-slow
python -m pip install cython==0.29.36
if [[ "${{ matrix.oldmatplotlib }}" ]]; then
python -m pip install matplotlib==3.5.3
fi
if [[ -z "${{ matrix.nocvxopt }}" ]]; then
QUTIP_TARGET="$QUTIP_TARGET,semidefinite"
python -m pip install cvxpy>=1.0 cvxopt # semidefinite
fi
export CI_QUTIP_WITH_OPENMP=${{ matrix.openmp }}
if [[ -z "${{ matrix.nomkl }}" ]]; then
Expand All @@ -164,9 +175,11 @@ jobs:
if [[ -n "${{ matrix.conda-extra-pkgs }}" ]]; then
conda install "${{ matrix.conda-extra-pkgs }}"
fi
python -m pip install -e .[$QUTIP_TARGET]
python -m pip install "coverage${{ matrix.coverage-requirement }}"
python -m pip install pytest-cov coveralls pytest-fail-slow
python -m pip install -e . -v --no-build-isolation
if [[ "${{ matrix.nocython }}" ]]; then
python -m pip uninstall cython -y
fi
- name: Package information
run: |
Expand Down
1 change: 1 addition & 0 deletions doc/changes/2383.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Exclude scipy 1.13 from in the requirements
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ include_package_data = True
zip_safe = False
install_requires =
numpy>=1.16.6
scipy>=1.0
scipy>=1.0,<1.13.0
packaging
setup_requires =
numpy>=1.13.3
Expand Down

0 comments on commit 50081e5

Please sign in to comment.