Skip to content

Commit

Permalink
CI: fix wrong syntax in CI env yml files (mamba 2.0 compat) (#59910)
Browse files Browse the repository at this point in the history
* fix wrong syntax in CI env yml files

* fix other files

* remove micromamba pin
  • Loading branch information
jorisvandenbossche authored Oct 31, 2024
1 parent 8be2f8b commit de4eaf8
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
2 changes: 0 additions & 2 deletions .github/actions/setup-conda/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ runs:
- name: Install ${{ inputs.environment-file }}
uses: mamba-org/setup-micromamba@v1
with:
# Pinning to avoid 2.0 failures
micromamba-version: '1.5.10-0'
environment-file: ${{ inputs.environment-file }}
environment-name: test
condarc-file: ci/.condarc
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-310-minimum_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dependencies:
- python=3.10

# build dependencies
- versioneer[toml]
- versioneer
- cython>=0.29.33
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-310.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies:
- python=3.10

# build dependencies
- versioneer[toml]
- versioneer
- cython>=0.29.33
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-311-downstream_compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:
- python=3.11

# build dependencies
- versioneer[toml]
- versioneer
- cython>=0.29.33
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-311-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ dependencies:
- python=3.11

# build dependencies
- versioneer[toml]
- meson[ninja]=1.2.1
- versioneer
- meson=1.2.1
- meson-python=0.13.1
- cython>=0.29.33

Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-311-pyarrownightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ dependencies:
- python=3.11

# build dependencies
- versioneer[toml]
- meson[ninja]=1.2.1
- versioneer
- meson=1.2.1
- cython>=0.29.33
- meson-python=0.13.1

Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-311.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies:
- python=3.11

# build dependencies
- versioneer[toml]
- versioneer
- cython>=0.29.33
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-312.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies:
- python=3.12

# build dependencies
- versioneer[toml]
- versioneer
- cython>=0.29.33
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/actions-pypy-39.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ dependencies:
- python=3.9[build=*_pypy]

# build dependencies
- versioneer[toml]
- versioneer
- cython>=0.29.33
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/circle-311-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies:
- python=3.11

# build dependencies
- versioneer[toml]
- versioneer
- cython>=0.29.33
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dependencies:
- pip

# build dependencies
- versioneer[toml]
- versioneer
- cython~=3.0.5
- meson[ninja]=1.2.1
- meson=1.2.1
- meson-python=0.13.1

# test dependencies
Expand Down
2 changes: 2 additions & 0 deletions scripts/generate_pip_deps_from_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
EXCLUDE = {"python", "c-compiler", "cxx-compiler"}
REMAP_VERSION = {"tzdata": "2022.7"}
CONDA_TO_PIP = {
"versioneer": "versioneer[toml]",
"meson": "meson[ninja]",
"pytables": "tables",
"psycopg2": "psycopg2-binary",
"dask-core": "dask",
Expand Down

0 comments on commit de4eaf8

Please sign in to comment.