Skip to content

Free (unpin) numpy so we can test with the new numpy 2.0.0 (needs Basemap update) #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
valeriupredoi wants to merge 15 commits into from
Closed

Free (unpin) numpy so we can test with the new numpy 2.0.0 (needs Basemap update) #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
314943d
unpin numpy
valeriupredoi Jun 25, 2024
3aa2260
unpin numpy
valeriupredoi Jun 25, 2024
b930678
put a conda list
valeriupredoi Jun 25, 2024
5b25951
force numpy pin
valeriupredoi Jun 25, 2024
1421bda
force numpy pin
valeriupredoi Jun 25, 2024
10667b9
comment out basemap detect other incompatibilities
valeriupredoi Jun 25, 2024
205b888
comment out basemap detect other incompatibilities
valeriupredoi Jun 25, 2024
f736f65
put basemap back in
valeriupredoi Jun 25, 2024
276913e
put basemap back in
valeriupredoi Jun 25, 2024
99a5a5b
use install from PyPI for baemap
valeriupredoi Jul 12, 2024
d8a3174
do not install basemap from setup
valeriupredoi Jul 12, 2024
f442662
Revert "do not install basemap from setup"
valeriupredoi Jul 15, 2024
45d6c7e
Revert "use install from PyPI for baemap"
valeriupredoi Jul 15, 2024
844b361
test again
valeriupredoi Feb 24, 2025
dc61461
Merge branch 'main' into free_numpy
valeriupredoi Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/run-tests-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 3 additions & 1 deletion .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading