Merge remote-tracking branch 'origin/main' into dev_somesatr

valeriupredoi · Oct 23, 2024 · 375f6ff · 375f6ff
2 parents dd0460b + 823f0b0
commit 375f6ff
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/run-tests-push.yml b/.github/workflows/run-tests-push.yml
@@ -19,7 +19,6 @@ jobs:
           environment-file: environment.yml
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - shell: bash -l {0}
         run: conda --version

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -24,7 +24,6 @@ jobs:
           environment-file: environment.yml
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - shell: bash -l {0}
         run: conda --version

diff --git a/environment.yml b/environment.yml
@@ -11,7 +11,7 @@ dependencies:
   - matplotlib
   - nctoolkit >=0.8.7  # use linux64 build
   - netcdf4
-  - numpy >1.24.3 
+  - numpy >1.24.3,<2.0  # needs thorough checking when released
   - pip !=21.3
   - python >=3.9
   - pyyaml

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@
         'matplotlib',
         'nctoolkit>=0.8.7',  # use linux64 build
         'netcdf4',
-        'numpy>1.24.3',
+        'numpy>1.24.3,<2.0',
         'pip!=21.3',
         'pyyaml',
         'scikit-learn',