Skip to content

Commit

Permalink
Updates to wheel workflow: (#933)
Browse files Browse the repository at this point in the history
* Build for Py 3.10 via linux action shell script.
  This was missed in #928 and is needed for #918
* Fix missing git history needed for setuptools_scm
  to do its thing for Linux wheels
* Skip wheel builds for macOS/Py 3.10.
  It fails for reasons we cannot understand.
  • Loading branch information
molpopgen committed May 25, 2022
1 parent 0715c11 commit e35c0da
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/manylinux/buildwheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@ cd gsl-${GSL_VERSION}
make -j 2
make install
cd ..

# Taken from msprime/#2043
# We're running as root in the docker container so git commands issued by
# setuptools_scm will fail without this:
git config --global --add safe.directory /project
# Fetch the full history as we'll be missing tags otherwise.
# git fetch --unshallow

for py in cp37-cp37m cp38-cp38 cp39-cp39
for py in cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310
do
PYPATH=/opt/python/${py}
PYBIN=${PYPATH}/bin/python
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ on:
- cron: "0 0 1 * *"
release:
types: [created]
push:
branches: [main, dev]

jobs:
macOS:
runs-on: macos-latest
strategy:
matrix:
python: [3.7, 3.8, 3.9, "3.10"]
python: [3.7, 3.8, 3.9] #, "3.10"]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -31,10 +33,6 @@ jobs:
# Instead of letting setup.py install a newer numpy we install it here
# using the oldest supported version for ABI compatibility
pip install oldest-supported-numpy
- name: Build module
run: |
python -VV
python setup.py build_ext --inplace
- name: Build Wheel
run: |
python setup.py bdist_wheel
Expand Down Expand Up @@ -111,7 +109,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python: [3.7, 3.8, 3.9, "3.10"]
python: [3.7, 3.8, 3.9] #, "3.10"]
steps:
- name: Download wheels
uses: actions/download-artifact@v2
Expand All @@ -121,11 +119,15 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- name: ls
run: |
ls -lhrt
- name: Install wheel and test
run: |
python -VV
pip install --upgrade pip
# Install the local wheel
pip install fwdpy11 --only-binary fwdpy11 -f .
python -m pip install fwdpy11 --only-binary fwdpy11 -f .
python -c "import fwdpy11;print(fwdpy11.__version__)"
upload_to_PyPI:
Expand Down

0 comments on commit e35c0da

Please sign in to comment.