Merge remote-tracking branch 'upstream/main' into TST-add-use_arrow-f…

…or-geopandas-tests-with-sql-statement
geopandas · Jan 23, 2024 · c559795 · c559795
2 parents f6e9e36 + 6e5112e
commit c559795
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/docker-gdal.yml b/.github/workflows/docker-gdal.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         container:
           - "ghcr.io/osgeo/gdal:ubuntu-small-latest" # >= python 3.10.6
-          - "ghcr.io/osgeo/gdal:ubuntu-small-3.8.1" # python 3.10.12
+          - "ghcr.io/osgeo/gdal:ubuntu-small-3.8.3" # python 3.10.12
           - "ghcr.io/osgeo/gdal:ubuntu-small-3.7.3" # python 3.10.12
           - "ghcr.io/osgeo/gdal:ubuntu-small-3.6.4" # python 3.10.6
           - "osgeo/gdal:ubuntu-small-3.5.3" # python 3.8.10

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - uses: pre-commit/action@v3.0.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 
@@ -215,7 +215,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true

diff --git a/.github/workflows/tests-conda.yml b/.github/workflows/tests-conda.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   test:
-    name: ${{ matrix.os }} (Python ${{ matrix.python }})
+    name: ${{ matrix.os }}, python ${{ matrix.python }}, ${{ matrix.env }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -24,35 +24,35 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-2019]
         python: ["3.10", "3.11", "3.12"]
-        env: ["environment.yml"]
+        env: ["latest"]
         include:
           # environment with lower versions of optional dependencies
           - python: "3.10"
-            extra: |
+            extra: >-
               pandas=1.5
               geopandas=0.12
           # minimal environment without optional dependencies
           - os: "ubuntu-latest"
             python: "3.9"
-            env: "environment-minimal.yml"
+            env: "minimal"
           # environment for older Windows libgdal to make sure gdal_i.lib is
           # properly detected
           - os: "windows-2019"
             python: "3.10"
-            env: "environment-libgdal3.5.1.yml"
+            env: "libgdal3.5.1"
 
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
 
       - name: Install Conda environment with Micromamba
-        uses: mamba-org/provision-with-micromamba@main
+        uses: mamba-org/setup-micromamba@v1
         with:
-          environment-file: ci/${{ matrix.env }}
-          extra-specs: |
+          environment-file: ci/envs/${{ matrix.env }}.yml
+          create-args: >-
             python=${{ matrix.python }}
             ${{ matrix.extra }}
-          cache-env: true
+          cache-environment: true
 
       - name: Set environment variables (Windows)
         if: runner.os == 'Windows'

diff --git a/ci/environment.yml → ci/envs/latest.yml b/ci/environment.yml → ci/envs/latest.yml
diff --git a/ci/environment-libgdal3.5.1.yml → ci/envs/libgdal3.5.1.yml b/ci/environment-libgdal3.5.1.yml → ci/envs/libgdal3.5.1.yml
diff --git a/ci/environment-minimal.yml → ci/envs/minimal.yml b/ci/environment-minimal.yml → ci/envs/minimal.yml