Skip to content

Commit

Permalink
chg: dev: one more conda-devenv refactor based on latest docs
Browse files Browse the repository at this point in the history
* also cleanup the wheel artifact check, download to artifacts/

Signed-off-by: Stephen Arnold <[email protected]>
  • Loading branch information
sarnold committed Sep 9, 2024
1 parent f254daa commit ae58b0b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 21 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/conda-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
- uses: actions/checkout@v4

- uses: conda-incubator/setup-miniconda@v3
env:
PY_VER: ${{ matrix.python-version }}
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
activate-environment: pyre2
environment-file: environment.devenv.yml
channels: conda-forge
allow-softlinks: true
channel-priority: flexible
show-channel-urls: true

- name: Cache conda packages
id: cache
Expand All @@ -54,16 +54,15 @@ jobs:
PY_VER: ${{ matrix.python-version }}
run: |
conda config --set always_yes yes --set changeps1 no
conda info
conda list
conda config --show-sources
conda config --show
printenv | sort
conda config --add channels conda-forge
conda install conda-devenv
conda devenv
- name: Build and test
shell: bash -el {0}
env:
PY_VER: ${{ matrix.python-version }}
run: |
source activate pyre2
python -m pip install .[test] -vv
python -m pytest -v .
7 changes: 4 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ jobs:
name: Check artifacts are correct
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
path: artifacts

# note wheels should be in subdirectory <upload_name>
# note wheels should be in subdirectories named <artifact_name>
- name: Check number of downloaded artifacts
run: ls -l artifact
run: ls -l artifacts/*
9 changes: 2 additions & 7 deletions environment.devenv.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
name: pyre2

{% set python_version = os.environ.get("PY_VER", "3.11") %}

channels:
- conda-forge

dependencies:
- cmake>=3.18
- ninja
Expand All @@ -16,12 +11,12 @@ dependencies:
- pybind11-stubgen
- vs2019_win-64 # [win]
- pkgconfig # [win]
- python={{ python_version }}
- python ={{ get_env("PY_VER", default="3.9") }}
- cython
- pybind11
- pip
- pytest
- regex
# these two need to be newer than broken runner packages
# these two need to be newer than broken runner packages, 3.12 only
- urllib3
- six

0 comments on commit ae58b0b

Please sign in to comment.