Skip to content

Commit

Permalink
Update GitHub Actions to use Python 3.12 (opengeos#892)
Browse files Browse the repository at this point in the history
* Update GitHub Actions to use Python 3.12

* Add setuptools

* Add planet api key

* Update windows.yml
  • Loading branch information
giswqs authored Sep 20, 2024
1 parent e5441e0 commit 07265fd
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 21 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

defaults:
run:
Expand All @@ -20,8 +20,6 @@ jobs:
PLANET_API_KEY: ${{ secrets.PLANET_API_KEY }}
USE_FOLIUM: ${{ secrets.USE_FOLIUM }}
USE_MKDOCS: ${{ secrets.USE_MKDOCS }}
HEREMAPS_API_KEY: ${{ secrets.HEREMAPS_API_KEY }}
DP_TOKEN: ${{ secrets.DP_TOKEN }}
MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

defaults:
run:
Expand All @@ -18,8 +18,6 @@ jobs:
PLANET_API_KEY: ${{ secrets.PLANET_API_KEY }}
USE_FOLIUM: ${{ secrets.USE_FOLIUM }}
USE_MKDOCS: ${{ secrets.USE_MKDOCS }}
HEREMAPS_API_KEY: ${{ secrets.HEREMAPS_API_KEY }}
DP_TOKEN: ${{ secrets.DP_TOKEN }}
MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
config:
- { os: macOS-latest, py: "3.11" }
- { os: macOS-latest, py: "3.12" }
env:
SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ubuntu_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ jobs:
conda install -c conda-forge mamba --yes
mamba install -c conda-forge gdal pyproj pyzmq --yes
# - name: Test GDAL installation
# run: |
# python -c "from osgeo import gdal"
# gdalinfo --version
- name: Test GDAL installation
run: |
python -c "from osgeo import gdal"
gdalinfo --version
- name: Install dependencies
run: |
Expand All @@ -80,4 +80,4 @@ jobs:

- name: Running pytest
run: |
pytest . --verbose
pytest . --verbose
14 changes: 5 additions & 9 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

defaults:
run:
Expand All @@ -22,8 +22,6 @@ jobs:
PLANET_API_KEY: ${{ secrets.PLANET_API_KEY }}
USE_FOLIUM: ${{ secrets.USE_FOLIUM }}
USE_MKDOCS: ${{ secrets.USE_MKDOCS }}
HEREMAPS_API_KEY: ${{ secrets.HEREMAPS_API_KEY }}
DP_TOKEN: ${{ secrets.DP_TOKEN }}
MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -59,18 +57,16 @@ jobs:
conda install -c conda-forge mamba --yes
mamba install -c conda-forge gdal pyproj --yes
# - name: Test GDAL installation
# run: |
# python -c "from osgeo import gdal"
# gdalinfo --version
- name: Test GDAL installation
run: |
python -c "from osgeo import gdal"
gdalinfo --version
- name: Install dependencies
run: |
pip install -r requirements.txt
pip install .
pip install pytest
pip install geopandas
pip install pmtiles
pip install -r requirements_dev.txt
- name: Test import
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ pyshp>=2.3.1
pystac-client>=0.8.2
python-box>=7.2.0
scooby>=0.10.0
setuptools>=71.0.4
whiteboxgui>=2.3.0
xyzservices>=2024.6.0

0 comments on commit 07265fd

Please sign in to comment.