From 1deba44d3b8cfd2a88135915868085ed9011372a Mon Sep 17 00:00:00 2001 From: Max Bachmann Date: Wed, 20 Oct 2021 12:43:10 +0200 Subject: [PATCH] skip Python3.10 on MacOs for now --- .github/workflows/releasebuild.yml | 33 ++++++++++++++++++++++++++++-- VERSION | 2 +- docs/conf.py | 2 +- setup.cfg | 1 + src/rapidfuzz-cpp | 2 +- src/rapidfuzz/__init__.py | 2 +- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/.github/workflows/releasebuild.yml b/.github/workflows/releasebuild.yml index 1544f6e..b98702c 100644 --- a/.github/workflows/releasebuild.yml +++ b/.github/workflows/releasebuild.yml @@ -82,7 +82,36 @@ jobs: fail-fast: false matrix: python_tag: ["cp37-*", "cp38-*", "cp39-*", "cp310-*"] - os: [windows-latest, macos-latest] + os: [windows-latest] + env: + CIBW_BUILD: ${{matrix.python_tag}} + CIBW_TEST_REQUIRES: pytest hypothesis pandas + CIBW_TEST_COMMAND: pytest {package}/tests + CIBW_BUILD_VERBOSITY: 3 + + steps: + - uses: actions/checkout@v2 + with: + submodules: 'true' + + - name: Build wheels + uses: pypa/cibuildwheel@v2.1.1 + with: + output-dir: wheelhouse + + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + path: ./wheelhouse/*.whl + + build_wheels: + name: Build wheel on ${{ matrix.os }}/auto/${{matrix.python_tag}} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + python_tag: ["cp37-*", "cp38-*", "cp39-*"] + os: [macos-latest] env: CIBW_BUILD: ${{matrix.python_tag}} CIBW_TEST_REQUIRES: pytest hypothesis pandas @@ -110,7 +139,7 @@ jobs: strategy: fail-fast: false matrix: - python_tag: ["cp38-*", "cp39-*", "cp310-*"] + python_tag: ["cp38-*", "cp39-*"] env: CIBW_BUILD: ${{matrix.python_tag}} CIBW_ARCHS_MACOS: "universal2 arm64" diff --git a/VERSION b/VERSION index 081af9a..afa2b35 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.1 \ No newline at end of file +1.8.0 \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 79b797c..383c7be 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ copyright = '2021, Max Bachmann' author = 'Max Bachmann' # The full version, including alpha/beta/rc tags -release = '1.7.1' +release = '1.8.0' # -- General configuration --------------------------------------------------- diff --git a/setup.cfg b/setup.cfg index 0c0e9a9..fbd5f06 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,6 +19,7 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 License :: OSI Approved :: MIT License [options] diff --git a/src/rapidfuzz-cpp b/src/rapidfuzz-cpp index 831a23c..9cdaa85 160000 --- a/src/rapidfuzz-cpp +++ b/src/rapidfuzz-cpp @@ -1 +1 @@ -Subproject commit 831a23cad24b3baf7b846c5248e2e465bf461a87 +Subproject commit 9cdaa85f76e3decd1d60855b96fdca1d5cb9002f diff --git a/src/rapidfuzz/__init__.py b/src/rapidfuzz/__init__.py index 31d612b..a502b72 100644 --- a/src/rapidfuzz/__init__.py +++ b/src/rapidfuzz/__init__.py @@ -3,6 +3,6 @@ rapid string matching library """ __author__ = "Max Bachmann" __license__ = "MIT" -__version__ = "1.7.1" +__version__ = "1.8.0" from rapidfuzz import process, fuzz, utils, levenshtein, string_metric