Skip to content

Commit

Permalink
Unpin pandas (#3924)
Browse files Browse the repository at this point in the history
Co-authored-by: sloosvel <45196700+sloosvel@users.noreply.github.com>
  • Loading branch information
valeriupredoi and sloosvel authored Mar 3, 2025
1 parent 0ad2a4e commit a8f929c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions environment.yml
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
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
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

0 comments on commit a8f929c

Please sign in to comment.