Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
larsbuntemeyer committed Jul 30, 2024
2 parents 5edc4bb + 7e116d2 commit d9eec37
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: 'v0.5.2'
rev: 'v0.5.5'
hooks:
- id: ruff
args: ["--fix"]
Expand Down
7 changes: 2 additions & 5 deletions ci/requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ dependencies:
- numpy<1.26.3
- pooch
- regionmask
#- setuptools
- xarray
- dask
- cf_xarray>=0.8.0
- cf_xarray>=0.8.1
- xesmf>=0.7.0
# - numba
- netCDF4
# for testing
- pytest
Expand All @@ -26,5 +24,4 @@ dependencies:
- cmor
- cdo
- python-cdo
- pip:
- git+https://github.com/euro-cordex/py-cordex.git # always use master for now
- py-cordex
2 changes: 1 addition & 1 deletion tests/test_codes.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def test_codes():
"description": "temperature",
"units": "K",
"layer": 110.0,
"time_cell_method": "mean",
"time_cell_method": "point",
"cf_name": "ta",
"code": 130,
"module": "atmos",
Expand Down

0 comments on commit d9eec37

Please sign in to comment.