Skip to content

Commit 826c230

Browse files
[backport 2.3.x] CI: fix wrong syntax in CI env yml files (mamba 2.0 compat) (#59910) (#60175)
CI: fix wrong syntax in CI env yml files (mamba 2.0 compat) (#59910) * fix wrong syntax in CI env yml files * fix other files * remove micromamba pin (cherry picked from commit de4eaf8)
1 parent 70c1feb commit 826c230

12 files changed

+22
-22
lines changed

.github/actions/setup-conda/action.yml

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ runs:
99
- name: Install ${{ inputs.environment-file }}
1010
uses: mamba-org/setup-micromamba@v1
1111
with:
12-
# Pinning to avoid 2.0 failures
13-
micromamba-version: '1.5.10-0'
1412
environment-file: ${{ inputs.environment-file }}
1513
environment-name: test
1614
condarc-file: ci/.condarc

ci/deps/actions-310.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dependencies:
55
- python=3.10
66

77
# build dependencies
8-
- versioneer[toml]
8+
- versioneer
99
- cython>=0.29.33
10-
- meson[ninja]=1.2.1
10+
- meson=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-311-downstream_compat.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ dependencies:
66
- python=3.11
77

88
# build dependencies
9-
- versioneer[toml]
9+
- versioneer
1010
- cython>=0.29.33
11-
- meson[ninja]=1.2.1
11+
- meson=1.2.1
1212
- meson-python=0.13.1
1313

1414
# test dependencies

ci/deps/actions-311-numpydev.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ dependencies:
55
- python=3.11
66

77
# build dependencies
8-
- versioneer[toml]
9-
- meson[ninja]=1.2.1
8+
- versioneer
9+
- meson=1.2.1
1010
- meson-python=0.13.1
1111
- cython>=0.29.33
1212

ci/deps/actions-311-pyarrownightly.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ dependencies:
55
- python=3.11
66

77
# build dependencies
8-
- versioneer[toml]
9-
- meson[ninja]=1.2.1
8+
- versioneer
9+
- meson=1.2.1
1010
- cython>=0.29.33
1111
- meson-python=0.13.1
1212

ci/deps/actions-311.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dependencies:
55
- python=3.11
66

77
# build dependencies
8-
- versioneer[toml]
8+
- versioneer
99
- cython>=0.29.33
10-
- meson[ninja]=1.2.1
10+
- meson=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-312.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dependencies:
55
- python=3.12
66

77
# build dependencies
8-
- versioneer[toml]
8+
- versioneer
99
- cython>=0.29.33
10-
- meson[ninja]=1.2.1
10+
- meson=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-39-minimum_versions.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies:
77
- python=3.9
88

99
# build dependencies
10-
- versioneer[toml]
10+
- versioneer
1111
- cython>=0.29.33
12-
- meson[ninja]=1.2.1
12+
- meson=1.2.1
1313
- meson-python=0.13.1
1414

1515
# test dependencies

ci/deps/actions-pypy-39.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ dependencies:
88
- python=3.9[build=*_pypy]
99

1010
# build dependencies
11-
- versioneer[toml]
11+
- versioneer
1212
- cython>=0.29.33
13-
- meson[ninja]=1.2.1
13+
- meson=1.2.1
1414
- meson-python=0.13.1
1515

1616
# test dependencies

ci/deps/circle-310-arm64.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dependencies:
55
- python=3.10
66

77
# build dependencies
8-
- versioneer[toml]
8+
- versioneer
99
- cython>=0.29.33
10-
- meson[ninja]=1.2.1
10+
- meson=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

environment.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies:
77
- pip
88

99
# build dependencies
10-
- versioneer[toml]
10+
- versioneer
1111
- cython=3.0.5
12-
- meson[ninja]=1.2.1
12+
- meson=1.2.1
1313
- meson-python=0.13.1
1414

1515
# test dependencies

scripts/generate_pip_deps_from_conda.py

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
EXCLUDE = {"python", "c-compiler", "cxx-compiler"}
2727
REMAP_VERSION = {"tzdata": "2022.7"}
2828
CONDA_TO_PIP = {
29+
"versioneer": "versioneer[toml]",
30+
"meson": "meson[ninja]",
2931
"pytables": "tables",
3032
"psycopg2": "psycopg2-binary",
3133
"dask-core": "dask",

0 commit comments

Comments
 (0)