CI: try to add a np 2.0.0rc2 matrix node

obspy · May 24, 2024 · c8f9860 · c8f9860
1 parent cd08b60
commit c8f9860
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/.github/test_conda_env.yml b/.github/test_conda_env.yml
@@ -7,7 +7,7 @@ dependencies:
   - decorator
   - lxml
   - matplotlib
-  - numpy
+  - numpy < 2
   - scipy
   - requests
   - setuptools

diff --git a/.github/test_conda_env_np2.yml b/.github/test_conda_env_np2.yml
@@ -0,0 +1,27 @@
+name: test
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  # obspy
+  - decorator
+  - lxml
+  - matplotlib
+  - numpy >= 2.0.0rc2
+  # dummy package needed to install the np2 rc via conda
+  - conda-forge/label/numpy_rc::_numpy_rc
+  - scipy
+  - requests
+  - setuptools
+  # see #3258
+  - sqlalchemy < 2.0
+  # soft dependencies
+  - cartopy
+  - geographiclib
+  - pyshp
+  # tests
+  - packaging
+  - pyproj
+  - pytest
+  - pytest-cov
+  - pytest-json-report >= 1.4
diff --git a/.github/test_mindep_conda_env.yml b/.github/test_mindep_conda_env.yml
@@ -7,7 +7,7 @@ dependencies:
   - decorator
   - lxml
   - matplotlib
-  - numpy
+  - numpy < 2
   - scipy
   - requests
   - setuptools

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -122,6 +122,9 @@ jobs:
           - os: ubuntu-latest
             python-version: '3.12'
             options: default warnings
+          - os: ubuntu-latest
+            python-version: '3.12'
+            options: default warnings np2
           - os: ubuntu-latest
             python-version: '3.12'
             options: ${{ (github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'test_network')) && 'network warnings' || 'default' }}
@@ -136,7 +139,7 @@ jobs:
       # set individual cache key
       cache_key: ${{ matrix.os }}-py${{ matrix.python-version }}-${{ contains(matrix.options, 'mindep') }}-${{ contains(matrix.options, 'mindepversion') }}
       # set conda environment file with dependencies
-      env_file: .github/test${{ contains(matrix.options, 'mindepversion') && '_mindepversion' || contains(matrix.options, 'mindep') && '_mindep' || '' }}_conda_env.yml
+      env_file: .github/test${{ contains(matrix.options, 'np2') && '_np2' || contains(matrix.options, 'mindepversion') && '_mindepversion' || contains(matrix.options, 'mindep') && '_mindep' || '' }}_conda_env.yml
       # set additional runtest options (--keep-images, --network, -W error)
       runtest_options: ${{ github.event_name == 'pull_request' && '--keep-images' || '' }} ${{ contains(matrix.options, 'network') && '--network' || '' }} ${{ contains(matrix.options, 'warnings') && '-W error' || '' }}
     steps: