From 83e2f01f085c1dfc7ed45a8855b2d5b90cfc95c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Thu, 7 Nov 2024 13:25:50 +0100 Subject: [PATCH 1/6] Use micromamba 1.5.10 together with conda for min-version-policy, since conda.api and libmambapy are not API compatible --- .github/workflows/ci-additional.yaml | 8 ++++---- ci/min_deps_check.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index d4a0141a673..012a9158040 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -304,8 +304,6 @@ jobs: name: Minimum Version Policy runs-on: "ubuntu-latest" needs: detect-ci-trigger - # disabled until `conda` is compatible with the new `libmambapy` - if: false && needs.detect-ci-trigger.outputs.triggered == 'false' defaults: run: shell: bash -l {0} @@ -318,13 +316,15 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} + # run with micromamba 1.5.10 together with conda + # conda.api is not API compatible with libmambapy + micromamba-version: 1.5.10 environment-name: xarray-tests create-args: >- python=3.12 pyyaml python-dateutil - libmambapy + conda - name: All-deps minimum versions policy run: | diff --git a/ci/min_deps_check.py b/ci/min_deps_check.py index a01d82ebfbb..443ab7d5a40 100755 --- a/ci/min_deps_check.py +++ b/ci/min_deps_check.py @@ -11,7 +11,7 @@ from collections.abc import Iterator from datetime import datetime -import libmambapy # type: ignore[import] +import conda.api # type: ignore[import] import yaml from dateutil.relativedelta import relativedelta @@ -93,7 +93,7 @@ def metadata(entry): return (major, minor), time - raw_data = libmambapy.SubdirData.query_all(pkg, channels=CHANNELS) + raw_data = conda.api.SubdirData.query_all(pkg, channels=CHANNELS) data = sorted(metadata(entry) for entry in raw_data if entry.timestamp != 0) release_dates = { From 634428a15187e8890e0a71619355c53c0aaabe18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Thu, 7 Nov 2024 13:35:50 +0100 Subject: [PATCH 2/6] fix version --- .github/workflows/ci-additional.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 012a9158040..1e66b660600 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -318,7 +318,7 @@ jobs: with: # run with micromamba 1.5.10 together with conda # conda.api is not API compatible with libmambapy - micromamba-version: 1.5.10 + micromamba-version: "1.5.10-0" environment-name: xarray-tests create-args: >- python=3.12 From c2f641cf8fd7e5b4c34509942212576aca109fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Thu, 7 Nov 2024 14:04:10 +0100 Subject: [PATCH 3/6] use micromamba 1.5.10-0 for benchmark, since micromamba 2 does not work with `asv`, yet --- .github/workflows/benchmarks-last-release.yml | 2 +- .github/workflows/benchmarks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmarks-last-release.yml b/.github/workflows/benchmarks-last-release.yml index 1df14dcc50c..5e36613368d 100644 --- a/.github/workflows/benchmarks-last-release.yml +++ b/.github/workflows/benchmarks-last-release.yml @@ -24,7 +24,7 @@ jobs: - name: Set up conda environment uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: '2.0.2-2' + micromamba-version: '1.5.10-0' environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests cache-environment: true diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 9daf042bd5e..9631798237b 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -27,7 +27,7 @@ jobs: - name: Set up conda environment uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: '2.0.2-2' + micromamba-version: '1.5.10-0' environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests cache-environment: true From aa21e3cf2ecc2a2d8d945dd2d7b165db3bf288c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Thu, 7 Nov 2024 14:23:21 +0100 Subject: [PATCH 4/6] pin mamba to <=1.5.10 in benchmark --- .github/workflows/benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 9631798237b..10032187078 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -36,7 +36,7 @@ jobs: create-args: >- asv python-build - mamba + mamba <=1.5.10 - name: Run benchmarks From 25dd56714119f7ddc7c78b72a7ab29adb824c1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Thu, 7 Nov 2024 14:25:13 +0100 Subject: [PATCH 5/6] pin mamba to <=1.5.10 in benchmark --- .github/workflows/benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 10032187078..e2cde27532d 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -36,7 +36,7 @@ jobs: create-args: >- asv python-build - mamba <=1.5.10 + mamba<=1.5.10 - name: Run benchmarks From 79f8f025705e210531b2e40a8efdf3e298e3699f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Fri, 8 Nov 2024 07:45:28 +0100 Subject: [PATCH 6/6] revert setting explicit micromamba-version --- .github/workflows/ci-additional.yaml | 7 +------ .github/workflows/ci.yaml | 2 -- .github/workflows/hypothesis.yaml | 1 - .github/workflows/upstream-dev-ci.yaml | 3 --- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 1e66b660600..b665d20b40a 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -14,7 +14,6 @@ concurrency: env: FORCE_COLOR: 3 - MICROMAMBA_VERSION: "2.0.2-2" jobs: detect-ci-trigger: @@ -58,7 +57,6 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -104,7 +102,6 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -156,7 +153,6 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -213,7 +209,6 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -270,7 +265,6 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -304,6 +298,7 @@ jobs: name: Minimum Version Policy runs-on: "ubuntu-latest" needs: detect-ci-trigger + if: needs.detect-ci-trigger.outputs.triggered == 'false' defaults: run: shell: bash -l {0} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1a08b4c5903..fc6d9d0e0b8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,6 @@ concurrency: env: FORCE_COLOR: 3 - micromamba_version: 2 jobs: detect-ci-trigger: @@ -111,7 +110,6 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: '2.0.2-2' environment-file: ${{ env.CONDA_ENV_FILE }} environment-name: xarray-tests cache-environment: true diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml index b90c2f26634..2a904c06824 100644 --- a/.github/workflows/hypothesis.yaml +++ b/.github/workflows/hypothesis.yaml @@ -63,7 +63,6 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: "2.0.2-2" environment-file: ci/requirements/environment.yml environment-name: xarray-tests create-args: >- diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 1d2aebab930..db8bd981e51 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -17,7 +17,6 @@ concurrency: env: FORCE_COLOR: 3 - MICROMAMBA_VERSION: "2.0.2-2" jobs: detect-ci-trigger: @@ -64,7 +63,6 @@ jobs: - name: Set up conda environment uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ci/requirements/environment.yml environment-name: xarray-tests create-args: >- @@ -121,7 +119,6 @@ jobs: - name: Set up conda environment uses: mamba-org/setup-micromamba@v2 with: - micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ci/requirements/environment.yml environment-name: xarray-tests create-args: >-