Skip to content

Commit 59d742f

Browse files
committed
chg: dev: one more conda-devenv refactor based on latest docs
* try 3.12 in this configuration, and remove it from the matrix if it still fails Signed-off-by: Stephen Arnold <[email protected]>
1 parent f254daa commit 59d742f

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

.github/workflows/conda-dev.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- uses: conda-incubator/setup-miniconda@v3
28+
env:
29+
PY_VER: ${{ matrix.python-version }}
2830
with:
29-
auto-update-conda: true
30-
python-version: ${{ matrix.python-version }}
31-
mamba-version: "*"
32-
channels: conda-forge,defaults
33-
channel-priority: true
3431
activate-environment: pyre2
35-
environment-file: environment.devenv.yml
32+
channels: conda-forge
33+
allow-softlinks: true
34+
channel-priority: flexible
35+
show-channel-urls: true
3636

3737
- name: Cache conda packages
3838
id: cache
@@ -54,16 +54,15 @@ jobs:
5454
PY_VER: ${{ matrix.python-version }}
5555
run: |
5656
conda config --set always_yes yes --set changeps1 no
57-
conda info
58-
conda list
59-
conda config --show-sources
60-
conda config --show
61-
printenv | sort
57+
conda config --add channels conda-forge
58+
conda install conda-devenv
59+
conda devenv
6260
6361
- name: Build and test
6462
shell: bash -el {0}
6563
env:
6664
PY_VER: ${{ matrix.python-version }}
6765
run: |
66+
source activate pyre2
6867
python -m pip install .[test] -vv
6968
python -m pytest -v .

environment.devenv.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
name: pyre2
22

3-
{% set python_version = os.environ.get("PY_VER", "3.11") %}
4-
5-
channels:
6-
- conda-forge
7-
83
dependencies:
94
- cmake>=3.18
105
- ninja
@@ -16,12 +11,12 @@ dependencies:
1611
- pybind11-stubgen
1712
- vs2019_win-64 # [win]
1813
- pkgconfig # [win]
19-
- python={{ python_version }}
14+
- python ={{ get_env("PY_VER", valid=["3.9", "3.10", "3.11", "3.12"]) }}
2015
- cython
2116
- pybind11
2217
- pip
2318
- pytest
2419
- regex
25-
# these two need to be newer than broken runner packages
20+
# these two need to be newer than broken runner packages, 3.12 only
2621
- urllib3
2722
- six

0 commit comments

Comments
 (0)