Skip to content

Unpin pandas #3924

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

Merged
sloosvel merged 9 commits into from
Mar 3, 2025
Merged

Unpin pandas #3924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c54c826
unpin pandas and r-base
valeriupredoi Feb 21, 2025
85b71e4
unpin pandas and r-base
valeriupredoi Feb 21, 2025
acd6ee5
Merge branch 'main' into unpin_pandas_rbase
valeriupredoi Feb 27, 2025
cb4588f
Merge branch 'main' into unpin_pandas_rbase
sloosvel Feb 28, 2025
1a688e3
Merge branch 'main' into unpin_pandas_rbase
valeriupredoi Feb 28, 2025
5dd40ab
run a GHA
valeriupredoi Feb 28, 2025
b7626d8
unrun GHA
valeriupredoi Feb 28, 2025
4b514b7
readd rbase pin
valeriupredoi Mar 3, 2025
418f37a
Merge branch 'main' into unpin_pandas_rbase
sloosvel Mar 3, 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
6 changes: 3 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies:
- numpy !=1.24.3 # severe masking bug
- openpyxl
- packaging
- pandas==2.1.4 # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
- pandas
- pip !=21.3
- progressbar2
- prov
Expand All @@ -62,7 +62,7 @@ dependencies:
- requests
- ruamel.yaml
- scikit-image
- scikit-learn >= 1.4.0 # github.com/ESMValGroup/ESMValTool/issues/3504
- scikit-learn >=1.4.0 # github.com/ESMValGroup/ESMValTool/issues/3504
- scipy
- seaborn
- seawater
Expand Down Expand Up @@ -106,7 +106,7 @@ dependencies:

# R and dependencies
- cdo
- r-base >=3.5,<4.3.0
- r-base >=3.5,<4.3.0 # https://github.com/ESMValGroup/ESMValTool/pull/3924
- r-abind
- r-akima
- r-climdex.pcic
Expand Down
4 changes: 2 additions & 2 deletions environment_osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies:
- numpy !=1.24.3 # severe masking bug
- openpyxl
- packaging
- pandas==2.1.4 # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
- pandas
- pip !=21.3
- progressbar2
- prov
Expand All @@ -61,7 +61,7 @@ dependencies:
- requests
- ruamel.yaml
- scikit-image
- scikit-learn >= 1.4.0 # github.com/ESMValGroup/ESMValTool/issues/3504
- scikit-learn >=1.4.0 # github.com/ESMValGroup/ESMValTool/issues/3504
- scipy
- seaborn
- seawater
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 @@ -51,7 +51,7 @@
'numpy!=1.24.3', # severe masking bug
'openpyxl',
'packaging',
'pandas==2.1.4', # see note in environment.yml
'pandas',
'progressbar2',
'psyplot>=1.5.0', # psy*<1.5.0 are not py312 compat
'psy-maps>=1.5.0',
Expand Down