diff --git a/.github/workflows/build-geventhttpclient.yml b/.github/workflows/build-geventhttpclient.yml index dc0d5d1e85a..ec81e66a840 100644 --- a/.github/workflows/build-geventhttpclient.yml +++ b/.github/workflows/build-geventhttpclient.yml @@ -78,10 +78,13 @@ jobs: persist-credentials: false # llhttp is compiled into the extension under its own MIT notice, which - # upstream's wheels do not ship. + # upstream's wheels do not ship before 2.6.0, so only older versions are patched. - name: Patch geventhttpclient source run: | - git apply python-wheels/patches/geventhttpclient/${{ env.GEVENTHTTPCLIENT_VERSION }}/00*.patch + patches="$PWD/python-wheels/patches/geventhttpclient/${GEVENTHTTPCLIENT_VERSION}" + if [ -d "$patches" ]; then + git apply -v "$patches"/*.patch + fi # musllinux is skipped: our registry carries gevent and brotli for # manylinux riscv64 only, so a musl wheel could be neither installed nor tested. @@ -99,7 +102,7 @@ jobs: CIBW_TEST_COMMAND: >- python -c "import importlib.metadata as m; l = {str(p).split('.dist-info/licenses/')[1] for p in m.files('geventhttpclient') if '.dist-info/licenses/' in str(p)}; - assert l == {'LICENSE-MIT', 'llhttp/LICENSE-MIT'}, l" && + assert l in ({'LICENSE-MIT', 'llhttp/LICENSE-MIT'}, {'LICENSE-MIT', 'llhttp/LICENSE'}), l" && python -m pytest tests # The only proof the untested cp314t wheel really carries the extension. diff --git a/docs/packages/geventhttpclient.yaml b/docs/packages/geventhttpclient.yaml index 20a45f05192..4a46719deaa 100644 --- a/docs/packages/geventhttpclient.yaml +++ b/docs/packages/geventhttpclient.yaml @@ -66,3 +66,5 @@ versions: - filename: geventhttpclient-2.5.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl sha256: b818e5a131b0e8f34c7282786c9b9f2c42fdbcb1be7c4db8275d2ff94c522e5c requires-python: '>=3.11' +- version: 2.6.0 +- version: 2.6.1