Skip to content

Commit 2ad4b40

Browse files
committed
fixing wget issues and env issues
1 parent 5333273 commit 2ad4b40

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

.github/workflows/build_wheels_and_release.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,16 @@ jobs:
2222
- name: Set up Python
2323
uses: actions/setup-python@v2
2424
with:
25-
python-version: '3.10'
26-
27-
- name: Set up Conda
28-
uses: conda-incubator/setup-miniconda@v2
29-
with:
30-
auto-update-conda: true
3125
python-version: '3.10'
32-
channels: conda-forge,defaults
33-
channel-priority: strict
3426

35-
- name: Install SLEEF and other dependencies
36-
shell: bash -l {0}
37-
run: |
38-
conda install -y sleef numpy meson meson-python patchelf wheel
39-
pip install cibuildwheel==2.20.0
27+
- name: Install cibuildwheel
28+
run: pip install cibuildwheel==2.20.0
4029

4130
- name: Build wheels
42-
shell: bash -l {0}
43-
run: |
44-
export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH
45-
export LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
46-
export CPATH=$CONDA_PREFIX/include:$CPATH
47-
python -m cibuildwheel --output-dir wheelhouse
31+
run: python -m cibuildwheel --output-dir wheelhouse
4832
env:
4933
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
5034
CIBW_BUILD_VERBOSITY: "1"
51-
CIBW_ENVIRONMENT: >
52-
LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH
53-
LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
54-
CPATH=$CONDA_PREFIX/include:$CPATH
5535
working-directory: ./quaddtype
5636

5737
- uses: actions/upload-artifact@v2

quaddtype/pyproject.toml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,24 @@ test = [
2828
archs = ["auto64"]
2929
skip = ["*-musllinux*", "pp*", "cp36-*", "cp37-*", "cp38-*"]
3030

31-
# The environment variable ensures the conda installation is available
32-
environment = { PATH = "$CONDA_PREFIX/bin:$PATH", LD_LIBRARY_PATH = "$CONDA_PREFIX/lib:$LD_LIBRARY_PATH" }
31+
[tool.cibuildwheel.linux]
32+
before-all = """
33+
yum install -y wget &&
34+
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh &&
35+
bash miniconda.sh -b -p $HOME/miniconda &&
36+
export PATH=$HOME/miniconda/bin:$PATH &&
37+
conda install -y -c conda-forge sleef
38+
"""
39+
environment = {PATH = "$HOME/miniconda/bin:$PATH", LD_LIBRARY_PATH = "$HOME/miniconda/lib:$LD_LIBRARY_PATH"}
40+
41+
[tool.cibuildwheel.macos]
42+
before-all = """
43+
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh &&
44+
bash miniconda.sh -b -p $HOME/miniconda &&
45+
export PATH=$HOME/miniconda/bin:$PATH &&
46+
conda install -y -c conda-forge sleef
47+
"""
48+
environment = {PATH = "$HOME/miniconda/bin:$PATH", DYLD_LIBRARY_PATH = "$HOME/miniconda/lib:$DYLD_LIBRARY_PATH"}
3349

3450
[tool.cibuildwheel.windows]
3551
before-build = "pip install delvewheel"

0 commit comments

Comments
 (0)