Skip to content
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

Jump to bottom

Pin cartopy<0.24 on v2.11.x release branch #3770

Merged
merged 12 commits into from
Oct 14, 2024
Merged

Pin cartopy<0.24 on v2.11.x release branch #3770

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
af552d6
pin cartopy <0.24
valeriupredoi Oct 11, 2024
6fb26ae
pin cartopy <0.24
valeriupredoi Oct 11, 2024
5a49dfa
run GA
valeriupredoi Oct 11, 2024
b945230
pin curl<8.10
valeriupredoi Oct 11, 2024
e55e86a
pin flake8 <6
valeriupredoi Oct 11, 2024
bf47e92
pin flake8 <6
valeriupredoi Oct 11, 2024
112ae95
flake8 7 pin rather
valeriupredoi Oct 11, 2024
373081c
flake8 7 pin rather
valeriupredoi Oct 11, 2024
fb9ca7c
free flake8 altogether
valeriupredoi Oct 11, 2024
b1c7c76
free flake8 altogether
valeriupredoi Oct 11, 2024
dec9b85
fix fkale8 barf
valeriupredoi Oct 11, 2024
3280553
Update .github/workflows/test.yml
valeriupredoi Oct 14, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- main
- pin_cartopy_on_v211branch
valeriupredoi marked this conversation as resolved.
Show resolved Hide resolved
schedule:
- cron: '0 0 * * *'

Expand Down
3 changes: 2 additions & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ channels:

dependencies:
- aiohttp
- cartopy
- cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767
- cdo >=2.3.0
- cdsapi
- cf-units
- cftime
- cmocean
- curl <8.10 # https://github.com/ESMValGroup/ESMValTool/pull/3755
- cython
- dask
- distributed
Expand Down
2 changes: 1 addition & 1 deletion environment_osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ channels:

dependencies:
- aiohttp
- cartopy
- cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767
- cdo >=2.3.0
- cdsapi
- cf-units
Expand Down
2 changes: 1 addition & 1 deletion esmvaltool/diag_scripts/climate_metrics/feedback_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def _create_regression_plot(tas_cube,
y_reg = reg.slope * x_reg + reg.intercept

# Plot data
title = (f'{FEEDBACK_PARAMETERS.get(var,var)} TOA radiance for '
title = (f'{FEEDBACK_PARAMETERS.get(var, var)} TOA radiance for '
f'{dataset_name}')
filename = f'{var}_regression_{dataset_name}'
if description is not None:
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 @@ -21,7 +21,7 @@
# Use with pip install . to install from source
'install': [
'aiohttp',
'cartopy',
'cartopy<0.24', # github.com/ESMValGroup/ESMValTool/issues/3767
'cdo',
'cdsapi',
'cf-units',
Expand Down
Loading