diff --git a/.github/workflows/build-wreq.yml b/.github/workflows/build-wreq.yml index de37dd4b6ad..4fc29af04ae 100644 --- a/.github/workflows/build-wreq.yml +++ b/.github/workflows/build-wreq.yml @@ -88,9 +88,24 @@ jobs: CIBW_BEFORE_ALL_LINUX: >- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && dnf install -y clang-devel git + # From 0.12.2 on, wreq-python's own Cargo.toml [patch.crates-io] pins + # wreq/wreq-util/btls to exact git revs, so a plain lockfile already + # resolves to those; the 0.12.1-only --precise pin below is no longer + # just unneeded but breaks the build, since cargo reads a --precise + # value against a git-patched dependency as a git ref, and + # "6.0.0-rc.29" isn't one in 0x676e67/wreq. + # From 0.13.0 on, wreq-python's [patch.crates-io] also floats netty to + # branch=main; netty's own Cargo.toml separately patches http2 to a git + # rev for a Connection::extended_connect_protocol method no http2 release + # has yet ("Remove once an http2 release includes" it, per netty's own + # comment), but a dependency's [patch] table is only honoured for the + # top-level workspace, so wreq-python's build never picks it up and + # resolves crates.io's http2 instead, which is missing that method. Add + # the same patch to wreq-python's own Cargo.toml before locking. CIBW_BEFORE_BUILD_LINUX: >- - cargo generate-lockfile && - cargo update -p wreq --precise ${{ env.WREQ_CRATE_VERSION }} + ${{ matrix.version == '0.12.1' && format('cargo generate-lockfile && cargo update -p wreq --precise {0}', env.WREQ_CRATE_VERSION) || + matrix.version == '0.13.0' && 'sed -i ''/^\[patch.crates-io\]/a http2 = { git = "https://github.com/0x676e67/http2", rev = "c932fc91f3139f5613a579b7b11df2860d66745c" }'' Cargo.toml && cargo generate-lockfile' || + 'cargo generate-lockfile' }} CIBW_ENVIRONMENT_LINUX: >- PATH="$PATH:$HOME/.cargo/bin" PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ diff --git a/docs/packages/wreq.yaml b/docs/packages/wreq.yaml index dc5568341f6..e047724aee9 100644 --- a/docs/packages/wreq.yaml +++ b/docs/packages/wreq.yaml @@ -11,3 +11,6 @@ versions: - filename: wreq-0.12.1-cp314-cp314t-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl sha256: dd93417a0f71b233fc802f8af7e82ce27418a6b179569bbcd9ba0f2f7b1197bb requires-python: '>=3.11' +- version: 0.12.2 +- version: 0.12.3 +- version: 0.13.0