Skip to content

Commit 9b4d88e

Browse files
authored
Merge branch 'main' into alias-system
2 parents 17d1ce8 + ca4503a commit 9b4d88e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+208
-130
lines changed

.github/workflows/benchmarks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
numpy
6161
pandas
6262
xarray
63-
netCDF4
6463
packaging
6564
geopandas
6665
pyarrow-core

.github/workflows/cache_data.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
numpy
5656
pandas
5757
xarray
58-
netCDF4
5958
packaging
6059
python-build
6160

.github/workflows/ci_docs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ jobs:
9696
numpy
9797
pandas
9898
xarray
99-
netCDF4
10099
packaging
101100
contextily
102101
geopandas

.github/workflows/ci_doctests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
numpy
5555
pandas
5656
xarray
57-
netCDF4
5857
packaging
5958
contextily
6059
geopandas

.github/workflows/ci_tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ jobs:
7575
numpy-version: '1.26'
7676
pandas-version: '=2.1'
7777
xarray-version: '=2023.07'
78-
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
78+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray netCDF4 sphinx-gallery'
7979
# Python 3.13 + core packages (latest versions) + optional packages
8080
- python-version: '3.13'
8181
numpy-version: '2.2'
8282
pandas-version: ''
8383
xarray-version: ''
84-
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
84+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray netCDF4 sphinx-gallery'
8585
# Python 3.12 + core packages (Linux only)
8686
- os: 'ubuntu-latest'
8787
python-version: '3.12'
@@ -129,7 +129,6 @@ jobs:
129129
numpy=${{ matrix.numpy-version }}
130130
pandas${{ matrix.pandas-version }}
131131
xarray${{ matrix.xarray-version }}
132-
netCDF4
133132
packaging
134133
make
135134
pip
@@ -152,8 +151,9 @@ jobs:
152151
GH_TOKEN: ${{ github.token }}
153152

154153
- name: Install uv
155-
uses: astral-sh/setup-uv@v5.4.2
154+
uses: astral-sh/setup-uv@v6.0.1
156155
with:
156+
activate-environment: true
157157
python-version: ${{ matrix.python-version }}
158158

159159
- name: Install dvc

.github/workflows/ci_tests_dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ jobs:
150150
run: |
151151
python -m pip install --pre --prefer-binary \
152152
--extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
153-
numpy pandas xarray netCDF4 packaging \
153+
numpy pandas xarray packaging \
154154
build contextily dvc geopandas ipython pyarrow rioxarray \
155155
pytest pytest-cov pytest-doctestplus pytest-mpl pytest-rerunfailures \
156-
sphinx-gallery
156+
netCDF4 sphinx-gallery
157157
158158
# Show installed pkg information for postmortem diagnostic
159159
- name: List installed packages

.github/workflows/ci_tests_legacy.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ jobs:
6464
numpy=1.26
6565
pandas
6666
xarray
67-
netCDF4
68-
packaging
67+
packaging=24.2
6968
contextily=1.5
7069
geopandas=1.0
7170
ipython

.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
persist-credentials: false
3232

3333
# Setup Python environment
34-
- uses: actions/setup-python@v5.5.0
34+
- uses: actions/setup-python@v5.6.0
3535
with:
3636
python-version: '3.13'
3737

.github/workflows/publish-to-pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
persist-credentials: false
5151

5252
- name: Set up Python
53-
uses: actions/setup-python@v5.5.0
53+
uses: actions/setup-python@v5.6.0
5454
with:
5555
python-version: '3.13'
5656

.github/workflows/style_checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
# Setup Python
3434
- name: Set up Python
35-
uses: actions/setup-python@v5.5.0
35+
uses: actions/setup-python@v5.6.0
3636
with:
3737
python-version: '3.13'
3838

0 commit comments

Comments
 (0)