diff --git a/.github/workflows/tests-conda.yml b/.github/workflows/tests-conda.yml index e0dffe26..53314082 100644 --- 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,7 +24,7 @@ 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" @@ -34,12 +34,12 @@ jobs: # 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 @@ -48,7 +48,7 @@ jobs: - name: Install Conda environment with Micromamba uses: mamba-org/setup-micromamba@v1 with: - environment-file: ci/${{ matrix.env }} + environment-file: ci/envs/${{ matrix.env }}.yml create-args: >- python=${{ matrix.python }} ${{ matrix.extra }} diff --git a/ci/environment.yml b/ci/envs/latest.yml similarity index 100% rename from ci/environment.yml rename to ci/envs/latest.yml diff --git a/ci/environment-libgdal3.5.1.yml b/ci/envs/libgdal3.5.1.yml similarity index 100% rename from ci/environment-libgdal3.5.1.yml rename to ci/envs/libgdal3.5.1.yml diff --git a/ci/environment-minimal.yml b/ci/envs/minimal.yml similarity index 100% rename from ci/environment-minimal.yml rename to ci/envs/minimal.yml