Merge branch 'main' into optipng

kmuehlbauer · web-flow · commit 0dacef1658ff · 2024-11-08T12:13:21.000+01:00
diff --git 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
@@ -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
@@ -36,7 +36,7 @@ jobs:
           create-args: >-
             asv
             python-build
-            mamba
+            mamba<=1.5.10
 
 
       - name: Run benchmarks
diff --git 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,8 +298,7 @@ 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'
+    if: needs.detect-ci-trigger.outputs.triggered == 'false'
     defaults:
       run:
         shell: bash -l {0}
@@ -318,13 +311,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-0"
           environment-name: xarray-tests
           create-args: >-
             python=3.12
             pyyaml
             python-dateutil
-            libmambapy
+            conda
 
       - name: All-deps minimum versions policy
         run: |
diff --git 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
@@ -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
@@ -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: >-
diff --git 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 = {
diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml
@@ -4,7 +4,7 @@ channels:
   - nodefaults
 dependencies:
   - aiobotocore
-  - array-api-strict
+  - array-api-strict<=2.1
   - boto3
   - bottleneck
   - cartopy
diff --git a/ci/requirements/all-but-numba.yml b/ci/requirements/all-but-numba.yml
@@ -6,7 +6,7 @@ dependencies:
   # Pin a "very new numpy" (updated Sept 24, 2024)
   - numpy>=2.1.1
   - aiobotocore
-  - array-api-strict
+  - array-api-strict<=2.1
   - boto3
   - bottleneck
   - cartopy
diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml
@@ -2,7 +2,7 @@ name: xarray-tests
 channels:
   - conda-forge
 dependencies:
-  - array-api-strict
+  - array-api-strict<=2.1
   - boto3
   - bottleneck
   - cartopy
diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml
@@ -4,7 +4,7 @@ channels:
   - nodefaults
 dependencies:
   - aiobotocore
-  - array-api-strict
+  - array-api-strict<=2.1
   - boto3
   - bottleneck
   - cartopy
diff --git a/pyproject.toml b/pyproject.toml
@@ -234,41 +234,40 @@ extend-exclude = [
 ]
 
 [tool.ruff.lint]
-# E402: module level import not at top of file
-# E501: line too long - let the formatter worry about that
-# E731: do not assign a lambda expression, use a def
+extend-select = [
+  "F",    # Pyflakes
+  "E",    # pycodestyle errors
+  "W",    # pycodestyle warnings
+  "I",    # isort
+  "UP",   # pyupgrade
+  "B",    # flake8-bugbear
+  "C4",   # flake8-comprehensions
+  "PIE",  # flake8-pie
+  "TID",  # flake8-tidy-imports (absolute imports)
+  "PGH",  # pygrep-hooks
+  "PERF", # Perflint
+  "RUF",
+]
 extend-safe-fixes = [
-  "TID252", # absolute imports
+  "TID252",  # absolute imports
 ]
 ignore = [
-  "C40",
-  "E402",
-  "E501",
-  "E731",
-  "UP007",
-  "PERF20",
+  "E402",    # module level import not at top of file
+  "E501",    # line too long - let the formatter worry about that
+  "E731",    # do not assign a lambda expression, use a def
+  "UP007",   # use X | Y for type annotations
+  "UP027",   # deprecated
+  "C40",     # unnecessary generator, comprehension, or literal
   "PIE790",  # unnecessary pass statement
-  "RUF001",
-  "RUF002",
-  "RUF003",
-  "RUF005",
-  "RUF012",
-]
-extend-select = [
-  "B", # flake8-bugbear
-  "C4", # flake8-comprehensions
-  "F", # Pyflakes
-  "E", # Pycodestyle
-  "W",
-  "TID", # flake8-tidy-imports (absolute imports)
-  "I", # isort
-  "PERF", # Perflint
-  "PIE", # flake8-pie
-  "PGH", # pygrep-hooks
-  "RUF",
-  "UP", # Pyupgrade
+  "PERF203", # try-except within a loop incurs performance overhead
+  "RUF001",  # string contains ambiguous unicode character
+  "RUF002",  # docstring contains ambiguous acute accent unicode character
+  "RUF003",  # comment contains ambiguous no-break space unicode character
+  "RUF005",  # consider upacking operator instead of concatenation
+  "RUF012",  # mutable class attributes
 ]
 
+
 [tool.ruff.lint.per-file-ignores]
 # don't enforce absolute imports
 "asv_bench/**" = ["TID252"]
