From 375ecd087e37d743be432b8d32e998a463fbd6eb Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Fri, 2 Aug 2024 10:21:54 -0400 Subject: [PATCH 1/5] BLD: drop upper pin on cython closes #98 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 200e6f6..adca1f8 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ROOT = pathlib.Path(__file__).parent -CYTHON_DEPENDENCY = 'Cython(>=0.29.24,<0.30.0)' +CYTHON_DEPENDENCY = 'Cython>=0.29.24' class httptools_build_ext(build_ext): From 8db4c5fbc378656f40a57888fa6058da3c24859d Mon Sep 17 00:00:00 2001 From: Fabien Bousquet Date: Tue, 8 Oct 2024 14:06:05 +0000 Subject: [PATCH 2/5] Add Python 3.13 support --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 200e6f6..02399b1 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ROOT = pathlib.Path(__file__).parent -CYTHON_DEPENDENCY = 'Cython(>=0.29.24,<0.30.0)' +CYTHON_DEPENDENCY = 'Cython(>=0.29.24,<3.1)' class httptools_build_ext(build_ext): From a950374929d94770aa2ca97afcbe25e19c098f2d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 8 Oct 2024 12:57:20 -0600 Subject: [PATCH 3/5] Fix build and run tests on Python 3.13 --- .github/workflows/release.yml | 1 + .github/workflows/tests.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 75b05ca..6e71aef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,6 +78,7 @@ jobs: - "cp310-*" - "cp311-*" - "cp312-*" + - "cp313-*" exclude: - os: ubuntu-latest cibw_arch: universal2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1c415c2..895b4ea 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] os: [windows-latest, ubuntu-latest, macos-latest] env: diff --git a/setup.py b/setup.py index 200e6f6..adca1f8 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ROOT = pathlib.Path(__file__).parent -CYTHON_DEPENDENCY = 'Cython(>=0.29.24,<0.30.0)' +CYTHON_DEPENDENCY = 'Cython>=0.29.24' class httptools_build_ext(build_ext): From aabb026d0dab63ed15f981218f389da4d9cde1eb Mon Sep 17 00:00:00 2001 From: Fabien Bousquet Date: Wed, 9 Oct 2024 07:16:44 +0000 Subject: [PATCH 4/5] Add wheel build and tests for Python 3.13 --- .github/workflows/release.yml | 1 + .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 75b05ca..6e71aef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,6 +78,7 @@ jobs: - "cp310-*" - "cp311-*" - "cp312-*" + - "cp313-*" exclude: - os: ubuntu-latest cibw_arch: universal2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1c415c2..895b4ea 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] os: [windows-latest, ubuntu-latest, macos-latest] env: From c2239b1bbeaeda9d4976d4e628998a9a9fc60e54 Mon Sep 17 00:00:00 2001 From: Fantix King Date: Mon, 14 Oct 2024 12:38:34 -0400 Subject: [PATCH 5/5] Bump versions of CI actions --- .github/workflows/release.yml | 48 +++++++++++++++++------------------ .github/workflows/tests.yml | 4 +-- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e71aef..036efc8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,9 +37,9 @@ jobs: mkdir -p dist/ echo "${VERSION}" > dist/VERSION - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: - name: dist + name: dist-version path: dist/ build-sdist: @@ -47,22 +47,22 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: fetch-depth: 50 submodules: true - name: Set up Python - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 - name: Build source distribution run: | python -m pip install -U setuptools wheel pip python setup.py sdist - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: - name: dist + name: dist-sdist path: dist/*.tar.* build-wheels: @@ -73,20 +73,17 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] cibw_arch: ["auto64", "aarch64", "universal2"] cibw_python: - - "cp38-*" - - "cp39-*" - - "cp310-*" - - "cp311-*" - - "cp312-*" - - "cp313-*" + - "cp38" + - "cp39" + - "cp310" + - "cp311" + - "cp312" + - "cp313" exclude: - os: ubuntu-latest cibw_arch: universal2 - os: macos-latest cibw_arch: aarch64 - - os: macos-latest - cibw_python: "cp37-*" - cibw_arch: universal2 - os: windows-latest cibw_arch: universal2 - os: windows-latest @@ -100,30 +97,30 @@ jobs: PIP_DISABLE_PIP_VERSION_CHECK: 1 steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: fetch-depth: 50 submodules: true - name: Set up QEMU if: matrix.os == 'ubuntu-latest' && matrix.cibw_arch == 'aarch64' - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0 + uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: platforms: arm64 - - uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2 + - uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b # v2.21.3 env: CIBW_BUILD_VERBOSITY: 1 - CIBW_BUILD: ${{ matrix.cibw_python }} + CIBW_BUILD: ${{ matrix.cibw_python }}-* CIBW_ARCHS: ${{ matrix.cibw_arch }} CIBW_TEST_EXTRAS: "test" CIBW_TEST_COMMAND: "python {project}/tests/__init__.py" CIBW_TEST_COMMAND_WINDOWS: "python {project}\\tests\\__init__.py" CIBW_TEST_SKIP: "*universal2:arm64" - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: - name: dist + name: dist-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ matrix.cibw_python }} path: wheelhouse/*.whl publish: @@ -131,14 +128,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: fetch-depth: 5 submodules: false - - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: - name: dist + pattern: dist-* + merge-multiple: true path: dist/ - name: Extract Release Version @@ -172,7 +170,7 @@ jobs: ls -al dist/ - name: Upload to PyPI - uses: pypa/gh-action-pypi-publish@b7f401de30cb6434a1e19f805ff006643653240e # v1.8.10 + uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3 with: user: __token__ password: ${{ secrets.PYPI_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 895b4ea..7c85de3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: PIP_DISABLE_PIP_VERSION_CHECK: 1 steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: fetch-depth: 50 submodules: true @@ -37,7 +37,7 @@ jobs: __version__\s*=\s*(?:['"])([[:PEP440:]])(?:['"]) - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 if: steps.release.outputs.version == 0 with: python-version: ${{ matrix.python-version }}