diff --git a/.github/workflows/run-tests-push.yml b/.github/workflows/run-tests-push.yml index 224c5ae9..410517a3 100644 --- a/.github/workflows/run-tests-push.yml +++ b/.github/workflows/run-tests-push.yml @@ -26,6 +26,8 @@ jobs: run: python -V - shell: bash -l {0} run: pip install -e .[develop] + - shell: bash -l {0} + run: conda list - shell: bash -l {0} run: | analysis_compare --help @@ -38,6 +40,6 @@ jobs: bgcval2_make_report --help download_from_mass --help - shell: bash -l {0} - run: pytest + run: pytest -n 2 - shell: bash -l {0} run: sphinx-build -Ea doc doc/build diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7b6937df..d82de3ae 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -31,6 +31,8 @@ jobs: run: python -V - shell: bash -l {0} run: pip install -e .[develop] + - shell: bash -l {0} + run: conda list - shell: bash -l {0} run: | analysis_compare --help @@ -44,6 +46,6 @@ jobs: bgcval2_make_report --help download_from_mass --help - shell: bash -l {0} - run: pytest + run: pytest -n 2 - shell: bash -l {0} run: sphinx-build -Ea doc doc/build diff --git a/environment.yml b/environment.yml index f2998d47..2fbd8a2a 100644 --- a/environment.yml +++ b/environment.yml @@ -11,7 +11,7 @@ dependencies: - matplotlib - nctoolkit >=0.8.7 # use linux64 build - netcdf4 - - numpy >1.24.3,<2.0 # needs thorough checking when released + - numpy >=2.0.0 - pip !=21.3 - python >=3.9 - pyyaml diff --git a/setup.py b/setup.py index 3d385086..a3de7d9a 100755 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ 'matplotlib', 'nctoolkit>=0.8.7', # use linux64 build 'netcdf4', - 'numpy>1.24.3,<2.0', + 'numpy>=2.0.0', 'pip!=21.3', 'pyyaml', 'scikit-learn',