Skip to content

Commit

Permalink
CI: Unpin geopandas and rasterio after the fix in #3672 (#3305)
Browse files Browse the repository at this point in the history
  • Loading branch information
seisman authored Dec 4, 2024
1 parent c4ea77e commit a92d9d0
Showing 6 changed files with 5 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
@@ -101,10 +101,9 @@ jobs:
netCDF4
packaging
contextily
geopandas<1.0
geopandas
ipython
pyarrow
rasterio<1.4.3
rioxarray
make
pip
1 change: 0 additions & 1 deletion .github/workflows/ci_doctests.yaml
Original file line number Diff line number Diff line change
@@ -61,7 +61,6 @@ jobs:
geopandas
ipython
pyarrow
rasterio<1.4.3
rioxarray
make
pip
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
@@ -73,13 +73,13 @@ jobs:
numpy-version: '1.24'
pandas-version: '=2.0'
xarray-version: '=2023.04'
optional-packages: ' contextily geopandas<1 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery'
optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery'
# Python 3.12 + core packages (latest versions) + optional packages
- python-version: '3.12'
numpy-version: '2.1'
pandas-version: ''
xarray-version: ''
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery'
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery'
# Python 3.11 + core packages (Linux only)
- os: 'ubuntu-latest'
python-version: '3.11'
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests_dev.yaml
Original file line number Diff line number Diff line change
@@ -152,7 +152,7 @@ jobs:
python -m pip install --pre --prefer-binary \
--extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
numpy pandas xarray netCDF4 packaging \
build contextily dvc geopandas ipython pyarrow 'rasterio<1.4.3' rioxarray \
build contextily dvc geopandas ipython pyarrow rioxarray \
pytest pytest-cov pytest-doctestplus pytest-mpl pytest-rerunfailures \
sphinx-gallery
1 change: 0 additions & 1 deletion .github/workflows/ci_tests_legacy.yaml
Original file line number Diff line number Diff line change
@@ -71,7 +71,6 @@ jobs:
geopandas
ipython
pyarrow
rasterio<1.4.3
rioxarray
sphinx-gallery
make
3 changes: 1 addition & 2 deletions ci/requirements/docs.yml
Original file line number Diff line number Diff line change
@@ -14,10 +14,9 @@ dependencies:
- packaging
# Optional dependencies
- contextily
- geopandas<1.0
- geopandas
- ipython
- pyarrow
- rasterio<1.4.3
- rioxarray
# Development dependencies (general)
- make

0 comments on commit a92d9d0

Please sign in to comment.