From 8bef3d313d93f5b8e48386f0445e7186a8485950 Mon Sep 17 00:00:00 2001 From: Qiusheng Wu Date: Fri, 20 Sep 2024 09:30:51 -0400 Subject: [PATCH] Update GitHub Actions to use Python 3.12 (#892) * Update GitHub Actions to use Python 3.12 * Add setuptools * Add planet api key * Update windows.yml --- .github/workflows/docs-build.yml | 4 +--- .github/workflows/docs.yml | 4 +--- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu_test.yml | 10 +++++----- .github/workflows/windows.yml | 14 +++++--------- requirements.txt | 1 + 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index a27aa5cf1b..c395537029 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.11"] + python-version: ["3.12"] defaults: run: @@ -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 }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6fb02d17af..ca5254261c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.11"] + python-version: ["3.12"] defaults: run: @@ -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 }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a02a99745f..8bac1fd80e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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: diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 403d4d81d7..c912b7f3e8 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -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: | @@ -80,4 +80,4 @@ jobs: - name: Running pytest run: | - pytest . --verbose + pytest . --verbose diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fd4725f619..1801a746b6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,7 +12,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.11"] + python-version: ["3.12"] defaults: run: @@ -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 }} @@ -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 diff --git a/requirements.txt b/requirements.txt index 635aa66e38..fd6bfd89f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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