From 198803c1a68377b5b323be812daf7b96af10400d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 18:29:11 +0000 Subject: [PATCH 1/8] Bump pypa/cibuildwheel from 2.17.0 to 2.21.3 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.17.0 to 2.21.3. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.17.0...v2.21.3) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/python-cibuildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-cibuildwheel.yml b/.github/workflows/python-cibuildwheel.yml index 035b5bf49..fa0cde049 100644 --- a/.github/workflows/python-cibuildwheel.yml +++ b/.github/workflows/python-cibuildwheel.yml @@ -109,7 +109,7 @@ jobs: ls /Users/runner/work/keyvi/keyvi/arm64-homebrew - name: Build python wheels for ${{ matrix.os }} on ${{ matrix.arch }} - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.21.3 env: # Skip CPython 3.6 and CPython 3.7 # skip pypy 3.8, https://github.com/pypa/distutils/issues/283 From 3ced26385e41dea9bd6c70c5e7d7a2c4fb24d8fb Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sun, 3 Nov 2024 20:33:11 +0100 Subject: [PATCH 2/8] pin setuptools --- python/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/python/requirements.txt b/python/requirements.txt index b2af40ec1..889bbbdcc 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -2,3 +2,4 @@ autowrap>=0.16.0 msgpack>=1.0.0 pytest>=7.1.1 cython>=3.0 +setuptools<72.2.0 From ee5ecbc763908575e3a7bc408040cb777d5db01d Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sun, 3 Nov 2024 21:01:16 +0100 Subject: [PATCH 3/8] remove have_wheel customization --- python/setup.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/python/setup.py b/python/setup.py index c7afd603b..6a6720a82 100644 --- a/python/setup.py +++ b/python/setup.py @@ -327,18 +327,6 @@ def run(self): clean_pykeyvi_build_directory() _clean.clean.run(self) - have_wheel = False - try: - import wheel.bdist_wheel as _bdist_wheel - - class bdist_wheel(custom_opts, _bdist_wheel.bdist_wheel): - parent = _bdist_wheel.bdist_wheel - user_options = _bdist_wheel.bdist_wheel.user_options + custom_user_options - - have_wheel = True - except: - None - class build_cxx(_build_ext.build_ext): description = "customized for keyvi: " + _build_ext.build_ext.description @@ -388,8 +376,7 @@ class build_ext(custom_opts, build_cxx): "bdist": bdist, "clean": clean, } - if have_wheel: - commands["bdist_wheel"] = bdist_wheel + for e in ext_modules: e.cython_directives = {"embedsignature": True} From 9210a1f2487735e9d3f3f0e294ef3550c19ed808 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sun, 3 Nov 2024 21:30:25 +0100 Subject: [PATCH 4/8] add minimal pyproject.toml --- python/pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 python/pyproject.toml diff --git a/python/pyproject.toml b/python/pyproject.toml new file mode 100644 index 000000000..7aec20a44 --- /dev/null +++ b/python/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = ["autowrap>=0.16.0", "msgpack>=1.0.0", "pytest>=7.1.1", "cython>=3.0", "setuptools>=61.0"] From 514f4903fe49ae619f8ee4ab49cc16b92789eae1 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sun, 3 Nov 2024 21:42:11 +0100 Subject: [PATCH 5/8] set MACOSX_DEPLOYMENT_TARGET=13.0 for all maxosx builds --- .github/workflows/python-cibuildwheel.yml | 2 +- python/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-cibuildwheel.yml b/.github/workflows/python-cibuildwheel.yml index fa0cde049..01dc81385 100644 --- a/.github/workflows/python-cibuildwheel.yml +++ b/.github/workflows/python-cibuildwheel.yml @@ -84,6 +84,7 @@ jobs: - name: install mac dependencies X86_64 if: ${{ (runner.os == 'macOS') && (matrix.arch == 'x86_64') }} run: | + echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV && \ brew update && \ brew install zlib snappy boost @@ -93,7 +94,6 @@ jobs: # Note: when brew reinstall finds unsolved deps, it downloads and installs using the wrong arch(x86_64 instead of arm64) run: | set -e - echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV echo "_CMAKE_PREFIX_PATH=${{ github.workspace }}/arm64-homebrew" >> $GITHUB_ENV echo "CIBW_REPAIR_WHEEL_COMMAND_MACOS=DYLD_LIBRARY_PATH=${{ github.workspace }}/arm64-homebrew delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" >> $GITHUB_ENV mkdir arm64-homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C arm64-homebrew diff --git a/python/pyproject.toml b/python/pyproject.toml index 7aec20a44..194726eab 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,2 +1,2 @@ [build-system] -requires = ["autowrap>=0.16.0", "msgpack>=1.0.0", "pytest>=7.1.1", "cython>=3.0", "setuptools>=61.0"] +requires = ["autowrap>=0.16.0", "msgpack>=1.0.0", "pytest>=7.1.1", "cython>=3.0"] From 6dc946b0c9ac63f3307b0538f37cd671cb6c24ab Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sun, 3 Nov 2024 21:58:58 +0100 Subject: [PATCH 6/8] skip pp39 --- .github/workflows/python-cibuildwheel.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-cibuildwheel.yml b/.github/workflows/python-cibuildwheel.yml index 01dc81385..b34b89f5b 100644 --- a/.github/workflows/python-cibuildwheel.yml +++ b/.github/workflows/python-cibuildwheel.yml @@ -94,6 +94,7 @@ jobs: # Note: when brew reinstall finds unsolved deps, it downloads and installs using the wrong arch(x86_64 instead of arm64) run: | set -e + echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV echo "_CMAKE_PREFIX_PATH=${{ github.workspace }}/arm64-homebrew" >> $GITHUB_ENV echo "CIBW_REPAIR_WHEEL_COMMAND_MACOS=DYLD_LIBRARY_PATH=${{ github.workspace }}/arm64-homebrew delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" >> $GITHUB_ENV mkdir arm64-homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C arm64-homebrew @@ -113,7 +114,7 @@ jobs: env: # Skip CPython 3.6 and CPython 3.7 # skip pypy 3.8, https://github.com/pypa/distutils/issues/283 - CIBW_SKIP: ${{ env.CIBW_SKIP }} cp36-* cp37-* pp38* + CIBW_SKIP: ${{ env.CIBW_SKIP }} cp36-* cp37-* pp38* pp39* # skip testing all python versions on linux arm, only test 3.12 # skip tests on pypy, currently fails for indexer tests From 7beb9ec888db6fceeba5bf0a8294b00d4dd1ab46 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sun, 3 Nov 2024 22:26:53 +0100 Subject: [PATCH 7/8] skip pypy builds --- .github/workflows/python-cibuildwheel.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-cibuildwheel.yml b/.github/workflows/python-cibuildwheel.yml index b34b89f5b..2e02dc0a0 100644 --- a/.github/workflows/python-cibuildwheel.yml +++ b/.github/workflows/python-cibuildwheel.yml @@ -17,18 +17,20 @@ jobs: os: [ubuntu-22.04, macos-13] # separate archs, so they use individual caches arch: [ 'x86_64', 'arm64' ] - flavor: ['cpython', 'pypy'] + # skip pypy, https://github.com/pypa/distutils/issues/283 + flavor: ['cpython'] # separate musl and many on linux, for mac we just skip one of those target: [ 'many', 'musl' ] exclude: - os: macos-13 target: musl - - os: ubuntu-22.04 - target: musl - flavor: pypy - - os: macos-13 - arch: arm64 - flavor: pypy + # skip pypy, https://github.com/pypa/distutils/issues/283 + #- os: ubuntu-22.04 + # target: musl + # flavor: pypy + #- os: macos-13 + # arch: arm64 + # flavor: pypy steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -113,8 +115,7 @@ jobs: uses: pypa/cibuildwheel@v2.21.3 env: # Skip CPython 3.6 and CPython 3.7 - # skip pypy 3.8, https://github.com/pypa/distutils/issues/283 - CIBW_SKIP: ${{ env.CIBW_SKIP }} cp36-* cp37-* pp38* pp39* + CIBW_SKIP: ${{ env.CIBW_SKIP }} cp36-* cp37-* # skip testing all python versions on linux arm, only test 3.12 # skip tests on pypy, currently fails for indexer tests From 771de07de0595799f071a62e6cb0580eabe0df96 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Tue, 5 Nov 2024 07:56:04 +0100 Subject: [PATCH 8/8] Update requirements.txt --- python/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/python/requirements.txt b/python/requirements.txt index 889bbbdcc..b2af40ec1 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -2,4 +2,3 @@ autowrap>=0.16.0 msgpack>=1.0.0 pytest>=7.1.1 cython>=3.0 -setuptools<72.2.0