From a18649e4a98e9c34b5533bb56c40ab88fd93d200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Wed, 6 Nov 2024 15:12:05 +0100 Subject: [PATCH 1/7] Move to micromamba 2 --- .github/workflows/ci-additional.yaml | 17 +---------------- .github/workflows/ci.yaml | 3 --- .github/workflows/hypothesis.yaml | 2 -- .github/workflows/upstream-dev-ci.yaml | 6 ------ ci/min_deps_check.py | 4 ++-- 5 files changed, 3 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 4f8c9be586f..78a252550ad 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -61,7 +61,6 @@ jobs: environment-name: xarray-tests create-args: >- python=${{env.PYTHON_VERSION}} - conda cache-environment: true cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" @@ -70,8 +69,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Run doctests run: | @@ -109,7 +106,6 @@ jobs: environment-name: xarray-tests create-args: >- python=${{env.PYTHON_VERSION}} - conda cache-environment: true cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" - name: Install xarray @@ -117,8 +113,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Install mypy run: | @@ -163,7 +157,6 @@ jobs: environment-name: xarray-tests create-args: >- python=${{env.PYTHON_VERSION}} - conda cache-environment: true cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" - name: Install xarray @@ -171,8 +164,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Install mypy run: | @@ -222,7 +213,6 @@ jobs: environment-name: xarray-tests create-args: >- python=${{env.PYTHON_VERSION}} - conda cache-environment: true cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" - name: Install xarray @@ -230,8 +220,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Install pyright run: | @@ -281,7 +269,6 @@ jobs: environment-name: xarray-tests create-args: >- python=${{env.PYTHON_VERSION}} - conda cache-environment: true cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" - name: Install xarray @@ -289,8 +276,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Install pyright run: | @@ -330,8 +315,8 @@ jobs: create-args: >- python=3.12 pyyaml - conda python-dateutil + libmambapy - name: All-deps minimum versions policy run: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e0f9489e325..fc6d9d0e0b8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -116,7 +116,6 @@ jobs: cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{matrix.python-version}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" create-args: >- python=${{matrix.python-version}} - conda # We only want to install this on one run, because otherwise we'll have # duplicate annotations. @@ -131,8 +130,6 @@ jobs: - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Import xarray diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml index aa58eb32ef0..2a904c06824 100644 --- a/.github/workflows/hypothesis.yaml +++ b/.github/workflows/hypothesis.yaml @@ -76,8 +76,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 873e3d16157..db8bd981e51 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -68,7 +68,6 @@ jobs: create-args: >- python=${{ matrix.python-version }} pytest-reportlog - conda - name: Install upstream versions run: | bash ci/install-upstream-wheels.sh @@ -77,8 +76,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Import xarray run: | @@ -127,7 +124,6 @@ jobs: create-args: >- python=${{ matrix.python-version }} pytest-reportlog - conda - name: Install upstream versions run: | bash ci/install-upstream-wheels.sh @@ -136,8 +132,6 @@ jobs: python -m pip install --no-deps -e . - name: Version info run: | - conda info -a - conda list python xarray/util/print_versions.py - name: Install mypy run: | diff --git a/ci/min_deps_check.py b/ci/min_deps_check.py index 8e09bb1eb90..4106470699e 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 conda.api # type: ignore[import] +import libmambapy # type: ignore[import] import yaml from dateutil.relativedelta import relativedelta @@ -93,7 +93,7 @@ def metadata(entry): return (major, minor), time - raw_data = conda.api.SubdirData.query_all(pkg, channels=CHANNELS) + raw_data = libmambapy.SubdirData.query_all(pkg, channels=CHANNELS) data = sorted(metadata(entry) for entry in raw_data if entry.timestamp != 0) release_dates = { From 361d4356f486937d45b0d7371884ca7e09025bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Wed, 6 Nov 2024 15:15:45 +0100 Subject: [PATCH 2/7] Move to micromamba 2 --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fc6d9d0e0b8..e178c3b96cf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,6 +14,7 @@ concurrency: env: FORCE_COLOR: 3 + micromamba_version: 2 jobs: detect-ci-trigger: From c0750ecec6b215a57412449512e18973ab3a88b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Wed, 6 Nov 2024 15:22:27 +0100 Subject: [PATCH 3/7] Move to micromamba 2 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e178c3b96cf..a51130bfab1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -109,7 +109,7 @@ jobs: echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV - name: Setup micromamba - uses: mamba-org/setup-micromamba@v2 + uses: mamba-org/setup-micromamba@v2.0.0 with: environment-file: ${{ env.CONDA_ENV_FILE }} environment-name: xarray-tests From 0547dba96508b03eab1e7575bc98edfb067e7525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Wed, 6 Nov 2024 15:38:18 +0100 Subject: [PATCH 4/7] Move to micromamba 2 --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a51130bfab1..bff6eb84d32 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -111,6 +111,7 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2.0.0 with: + micromamba-version: '2.0.2-2' environment-file: ${{ env.CONDA_ENV_FILE }} environment-name: xarray-tests cache-environment: true From 7034c3e58f1bedf5c6ad9873f696fcc975c1c640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Wed, 6 Nov 2024 15:43:54 +0100 Subject: [PATCH 5/7] Move to micromamba 2 --- .github/workflows/benchmarks-last-release.yml | 1 + .github/workflows/benchmarks.yml | 1 + .github/workflows/ci-additional.yaml | 7 +++++++ .github/workflows/ci.yaml | 2 +- .github/workflows/hypothesis.yaml | 1 + .github/workflows/upstream-dev-ci.yaml | 3 +++ 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks-last-release.yml b/.github/workflows/benchmarks-last-release.yml index 9bd0cc13b3d..1df14dcc50c 100644 --- a/.github/workflows/benchmarks-last-release.yml +++ b/.github/workflows/benchmarks-last-release.yml @@ -24,6 +24,7 @@ jobs: - name: Set up conda environment 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/benchmarks.yml b/.github/workflows/benchmarks.yml index bd06fbcde15..9daf042bd5e 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -27,6 +27,7 @@ jobs: - name: Set up conda environment 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/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 78a252550ad..a5b14f12cb2 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -14,6 +14,7 @@ concurrency: env: FORCE_COLOR: 3 + MICROMAMBA_VERSION: "2.0.2-2" jobs: detect-ci-trigger: @@ -57,6 +58,7 @@ 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: >- @@ -102,6 +104,7 @@ 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: >- @@ -153,6 +156,7 @@ 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: >- @@ -209,6 +213,7 @@ 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: >- @@ -265,6 +270,7 @@ 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: >- @@ -311,6 +317,7 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: + MICROMAMBA_VERSION: ${{env.MICROMAMBA_VERSION}} environment-name: xarray-tests create-args: >- python=3.12 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bff6eb84d32..1a08b4c5903 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -109,7 +109,7 @@ jobs: echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV - name: Setup micromamba - uses: mamba-org/setup-micromamba@v2.0.0 + uses: mamba-org/setup-micromamba@v2 with: micromamba-version: '2.0.2-2' environment-file: ${{ env.CONDA_ENV_FILE }} diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml index 2a904c06824..43d503c94f3 100644 --- a/.github/workflows/hypothesis.yaml +++ b/.github/workflows/hypothesis.yaml @@ -63,6 +63,7 @@ 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 db8bd981e51..d6343551c96 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -17,6 +17,7 @@ concurrency: env: FORCE_COLOR: 3 + MICROMAMBA_VERSION: "2.0.2-2" jobs: detect-ci-trigger: @@ -63,6 +64,7 @@ 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: >- @@ -119,6 +121,7 @@ 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: >- From 66a594d9ec57299d07fe3728db101a45f0c98304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Wed, 6 Nov 2024 15:46:14 +0100 Subject: [PATCH 6/7] Move to micromamba 2 --- .github/workflows/ci-additional.yaml | 8 ++++---- .github/workflows/hypothesis.yaml | 2 +- .github/workflows/upstream-dev-ci.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index a5b14f12cb2..6c9228f44d7 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -156,7 +156,7 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - MICROMAMBA_VERSION: ${{env.MICROMAMBA_VERSION}} + micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -213,7 +213,7 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - MICROMAMBA_VERSION: ${{env.MICROMAMBA_VERSION}} + micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -270,7 +270,7 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - MICROMAMBA_VERSION: ${{env.MICROMAMBA_VERSION}} + micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ${{env.CONDA_ENV_FILE}} environment-name: xarray-tests create-args: >- @@ -317,7 +317,7 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - MICROMAMBA_VERSION: ${{env.MICROMAMBA_VERSION}} + micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-name: xarray-tests create-args: >- python=3.12 diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml index 43d503c94f3..b90c2f26634 100644 --- a/.github/workflows/hypothesis.yaml +++ b/.github/workflows/hypothesis.yaml @@ -63,7 +63,7 @@ jobs: - name: Setup micromamba uses: mamba-org/setup-micromamba@v2 with: - MICROMAMBA_VERSION: "2.0.2-2" + 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 d6343551c96..1d2aebab930 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -64,7 +64,7 @@ jobs: - name: Set up conda environment uses: mamba-org/setup-micromamba@v2 with: - MICROMAMBA_VERSION: ${{env.MICROMAMBA_VERSION}} + micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ci/requirements/environment.yml environment-name: xarray-tests create-args: >- @@ -121,7 +121,7 @@ jobs: - name: Set up conda environment uses: mamba-org/setup-micromamba@v2 with: - MICROMAMBA_VERSION: ${{env.MICROMAMBA_VERSION}} + micromamba-version: ${{env.MICROMAMBA_VERSION}} environment-file: ci/requirements/environment.yml environment-name: xarray-tests create-args: >- From a54be2bcdb54a7190433a15aa52c48e11f2a664e Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Wed, 6 Nov 2024 18:04:54 +0100 Subject: [PATCH 7/7] temporarily disable the min-versions check --- .github/workflows/ci-additional.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 6c9228f44d7..d4a0141a673 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -304,7 +304,8 @@ jobs: name: Minimum Version Policy runs-on: "ubuntu-latest" needs: detect-ci-trigger - if: needs.detect-ci-trigger.outputs.triggered == 'false' + # disabled until `conda` is compatible with the new `libmambapy` + if: false && needs.detect-ci-trigger.outputs.triggered == 'false' defaults: run: shell: bash -l {0}