Skip to content

Commit

Permalink
Merge branch 'master' into add-python-311-support
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaelreinauer authored May 30, 2024
2 parents 540aabf + c3a2343 commit 12ee1f0
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
28 changes: 16 additions & 12 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,28 @@ jobs:
- uses: actions/checkout@v2

- name: Build wheels
uses: pypa/cibuildwheel@v2.3.1
uses: pypa/cibuildwheel@v2.18.1
env:
# Specify which Python versions to build wheels
# https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip
CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
# Skip 32 bit architectures, musllinux, and i686, and macOS x86_64 wheels for CP3.8 -- CP3.12
CIBW_SKIP: "*-win32 *-musllinux_x86_64 *_i686 cp38-macosx_x86_64 cp39-macosx_x86_64 cp310-macosx_x86_64 cp311-macosx_x86_64 cp312-macosx_x86_64"
CIBW_BEFORE_BUILD_WINDOWS: python -m pip install cmake && python -m pip install --upgrade pip setuptools && sed -i $'s/\r$//' README.rst && python -m pip install delvewheel
CIBW_BEFORE_BUILD_LINUX: python -m pip install cmake && python -m pip install --upgrade pip setuptools
CIBW_BEFORE_BUILD_MACOS: python -m pip install cmake && python -m pip install --upgrade pip setuptools
CIBW_TEST_COMMAND: python -m pyflagser.tests --webdl
CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-*"
# Skip 32 bit architectures, musllinux, and i686, and macOS x86_64 wheels for CP3.8 -- CP3.11
CIBW_SKIP: "*-win32 *-musllinux_x86_64 *_i686 cp38-macosx_x86_64 cp39-macosx_x86_64 cp310-macosx_x86_64 cp311-macosx_x86_64"
CIBW_BEFORE_BUILD_WINDOWS: sed -i $'s/\r$//' README.rst && python -m pip install delvewheel
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -vv -w {dest_dir} {wheel}"
CIBW_TEST_REQUIRES: pytest hypothesis
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
# Should generate universal2 wheels for CP3.8 -- CP3.12
CIBW_ARCHS_MACOS: x86_64 universal2

- uses: actions/upload-artifact@v2
name: Upload wheels
- name: Set-up python 3.10 for upload
uses: actions/setup-python@v5
with:
path: ./wheelhouse/*.whl
python-version: "3.10"
- name: Publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
pip install twine
twine check ./wheelhouse/*.whl
twine upload --skip-existing ./wheelhouse/*.whl
2 changes: 1 addition & 1 deletion pyflagser/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# 'X.Y.dev0' is the canonical version of 'X.Y.dev'
#

__version__ = '0.4.5'
__version__ = '0.4.6'
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10']
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11']
KEYWORDS = 'topological data analysis, persistent ' + \
'homology, directed flags complex, persistence diagrams'
INSTALL_REQUIRES = requirements
Expand Down

0 comments on commit 12ee1f0

Please sign in to comment.