luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #2818 #2819 

2818: pin CI to 3.11.0 as workaround for 2817 r=davidhewitt a=davidhewitt

While we have issues with 3.11.1, let's run 3.11.0 for now in tests so that we can make progress.

2819: netlify: add additional redirects to gh-pages r=davidhewitt a=davidhewitt

Just noticed that https://pyo3.rs/dev/bench has probably been broken since the move to netlify, and that https://pyo3.rs/v0.17.3 doesn't render nicely.

Add some redirects to netlify configuration to handle these cases.

Co-authored-by: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
This commit is contained in:
bors[bot] 2022-12-18 07:57:56 +00:00 committed by GitHub
parent 203ac5d778 b6874b8280 fe14d760a1
commit 81db4cff0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -95,7 +95,8 @@ jobs:
matrix:
extra-features: ["multiple-pymethods"]
rust: [stable]
python-version: ["3.11"]
# FIXME - pinned to 3.11.0 because 3.11.1 breaks CI on windows, see PyO3 issue 2817
python-version: ["3.11.0"]
platform:
[
{
@ -140,7 +141,8 @@ jobs:
"3.8",
"3.9",
"3.10",
"3.11",
# FIXME - pinned to 3.11.0 because 3.11.1 breaks CI on windows, see PyO3 issue 2817
"3.11.0",
"pypy-3.7",
"pypy-3.8",
"pypy-3.9"

73
.netlify/_redirects
View File

@ -1,142 +1,215 @@
/0.1.0/doc/* https://docs.rs/pyo3/0.1.0/:splat
/0.1.0 /0.1.0/
/0.1.0/* https://pyo3.github.io/pyo3/0.1.0/:splat 200
/0.2.0/doc/* https://docs.rs/pyo3/0.2.0/:splat
/0.2.0 /0.2.0/
/0.2.0/* https://pyo3.github.io/pyo3/0.2.0/:splat 200
/0.2.1/doc/* https://docs.rs/pyo3/0.2.1/:splat
/0.2.1 /0.2.1/
/0.2.1/* https://pyo3.github.io/pyo3/0.2.1/:splat 200
/0.2.2/doc/* https://docs.rs/pyo3/0.2.2/:splat
/0.2.2 /0.2.2/
/0.2.2/* https://pyo3.github.io/pyo3/0.2.2/:splat 200
/pyo3-derive-backend-0.6.0/doc/* https://docs.rs/pyo3/pyo3-derive-backend-0.6.0/:splat
/pyo3-derive-backend-0.6.0 /pyo3-derive-backend-0.6.0/
/pyo3-derive-backend-0.6.0/* https://pyo3.github.io/pyo3/pyo3-derive-backend-0.6.0/:splat 200
/v0.10.0/doc/* https://docs.rs/pyo3/0.10.0/:splat
/v0.10.0 /v0.10.0/
/v0.10.0/* https://pyo3.github.io/pyo3/v0.10.0/:splat 200
/v0.10.1/doc/* https://docs.rs/pyo3/0.10.1/:splat
/v0.10.1 /v0.10.1/
/v0.10.1/* https://pyo3.github.io/pyo3/v0.10.1/:splat 200
/v0.11.0/doc/* https://docs.rs/pyo3/0.11.0/:splat
/v0.11.0 /v0.11.0/
/v0.11.0/* https://pyo3.github.io/pyo3/v0.11.0/:splat 200
/v0.11.1/doc/* https://docs.rs/pyo3/0.11.1/:splat
/v0.11.1 /v0.11.1/
/v0.11.1/* https://pyo3.github.io/pyo3/v0.11.1/:splat 200
/v0.12.0/doc/* https://docs.rs/pyo3/0.12.0/:splat
/v0.12.0 /v0.12.0/
/v0.12.0/* https://pyo3.github.io/pyo3/v0.12.0/:splat 200
/v0.12.1/doc/* https://docs.rs/pyo3/0.12.1/:splat
/v0.12.1 /v0.12.1/
/v0.12.1/* https://pyo3.github.io/pyo3/v0.12.1/:splat 200
/v0.12.2/doc/* https://docs.rs/pyo3/0.12.2/:splat
/v0.12.2 /v0.12.2/
/v0.12.2/* https://pyo3.github.io/pyo3/v0.12.2/:splat 200
/v0.12.3/doc/* https://docs.rs/pyo3/0.12.3/:splat
/v0.12.3 /v0.12.3/
/v0.12.3/* https://pyo3.github.io/pyo3/v0.12.3/:splat 200
/v0.12.4/doc/* https://docs.rs/pyo3/0.12.4/:splat
/v0.12.4 /v0.12.4/
/v0.12.4/* https://pyo3.github.io/pyo3/v0.12.4/:splat 200
/v0.13.0/doc/* https://docs.rs/pyo3/0.13.0/:splat
/v0.13.0 /v0.13.0/
/v0.13.0/* https://pyo3.github.io/pyo3/v0.13.0/:splat 200
/v0.13.1/doc/* https://docs.rs/pyo3/0.13.1/:splat
/v0.13.1 /v0.13.1/
/v0.13.1/* https://pyo3.github.io/pyo3/v0.13.1/:splat 200
/v0.13.2/doc/* https://docs.rs/pyo3/0.13.2/:splat
/v0.13.2 /v0.13.2/
/v0.13.2/* https://pyo3.github.io/pyo3/v0.13.2/:splat 200
/v0.14.0/doc/* https://docs.rs/pyo3/0.14.0/:splat
/v0.14.0 /v0.14.0/
/v0.14.0/* https://pyo3.github.io/pyo3/v0.14.0/:splat 200
/v0.14.1/doc/* https://docs.rs/pyo3/0.14.1/:splat
/v0.14.1 /v0.14.1/
/v0.14.1/* https://pyo3.github.io/pyo3/v0.14.1/:splat 200
/v0.14.2/doc/* https://docs.rs/pyo3/0.14.2/:splat
/v0.14.2 /v0.14.2/
/v0.14.2/* https://pyo3.github.io/pyo3/v0.14.2/:splat 200
/v0.14.3/doc/* https://docs.rs/pyo3/0.14.3/:splat
/v0.14.3 /v0.14.3/
/v0.14.3/* https://pyo3.github.io/pyo3/v0.14.3/:splat 200
/v0.14.4/doc/* https://docs.rs/pyo3/0.14.4/:splat
/v0.14.4 /v0.14.4/
/v0.14.4/* https://pyo3.github.io/pyo3/v0.14.4/:splat 200
/v0.14.5/doc/* https://docs.rs/pyo3/0.14.5/:splat
/v0.14.5 /v0.14.5/
/v0.14.5/* https://pyo3.github.io/pyo3/v0.14.5/:splat 200
/v0.15.0/doc/* https://docs.rs/pyo3/0.15.0/:splat
/v0.15.0 /v0.15.0/
/v0.15.0/* https://pyo3.github.io/pyo3/v0.15.0/:splat 200
/v0.15.1/doc/* https://docs.rs/pyo3/0.15.1/:splat
/v0.15.1 /v0.15.1/
/v0.15.1/* https://pyo3.github.io/pyo3/v0.15.1/:splat 200
/v0.15.2/doc/* https://docs.rs/pyo3/0.15.2/:splat
/v0.15.2 /v0.15.2/
/v0.15.2/* https://pyo3.github.io/pyo3/v0.15.2/:splat 200
/v0.16.0/doc/* https://docs.rs/pyo3/0.16.0/:splat
/v0.16.0 /v0.16.0/
/v0.16.0/* https://pyo3.github.io/pyo3/v0.16.0/:splat 200
/v0.16.1/doc/* https://docs.rs/pyo3/0.16.1/:splat
/v0.16.1 /v0.16.1/
/v0.16.1/* https://pyo3.github.io/pyo3/v0.16.1/:splat 200
/v0.16.2/doc/* https://docs.rs/pyo3/0.16.2/:splat
/v0.16.2 /v0.16.2/
/v0.16.2/* https://pyo3.github.io/pyo3/v0.16.2/:splat 200
/v0.16.3/doc/* https://docs.rs/pyo3/0.16.3/:splat
/v0.16.3 /v0.16.3/
/v0.16.3/* https://pyo3.github.io/pyo3/v0.16.3/:splat 200
/v0.16.4/doc/* https://docs.rs/pyo3/0.16.4/:splat
/v0.16.4 /v0.16.4/
/v0.16.4/* https://pyo3.github.io/pyo3/v0.16.4/:splat 200
/v0.16.5/doc/* https://docs.rs/pyo3/0.16.5/:splat
/v0.16.5 /v0.16.5/
/v0.16.5/* https://pyo3.github.io/pyo3/v0.16.5/:splat 200
/v0.16.6/doc/* https://docs.rs/pyo3/0.16.6/:splat
/v0.16.6 /v0.16.6/
/v0.16.6/* https://pyo3.github.io/pyo3/v0.16.6/:splat 200
/v0.17.0/doc/* https://docs.rs/pyo3/0.17.0/:splat
/v0.17.0 /v0.17.0/
/v0.17.0/* https://pyo3.github.io/pyo3/v0.17.0/:splat 200
/v0.17.1/doc/* https://docs.rs/pyo3/0.17.1/:splat
/v0.17.1 /v0.17.1/
/v0.17.1/* https://pyo3.github.io/pyo3/v0.17.1/:splat 200
/v0.17.2/doc/* https://docs.rs/pyo3/0.17.2/:splat
/v0.17.2 /v0.17.2/
/v0.17.2/* https://pyo3.github.io/pyo3/v0.17.2/:splat 200
/v0.17.3/doc/* https://docs.rs/pyo3/0.17.3/:splat
/v0.17.3 /v0.17.3/
/v0.17.3/* https://pyo3.github.io/pyo3/v0.17.3/:splat 200
/v0.2.3/doc/* https://docs.rs/pyo3/0.2.3/:splat
/v0.2.3 /v0.2.3/
/v0.2.3/* https://pyo3.github.io/pyo3/v0.2.3/:splat 200
/v0.2.4/doc/* https://docs.rs/pyo3/0.2.4/:splat
/v0.2.4 /v0.2.4/
/v0.2.4/* https://pyo3.github.io/pyo3/v0.2.4/:splat 200
/v0.2.5/doc/* https://docs.rs/pyo3/0.2.5/:splat
/v0.2.5 /v0.2.5/
/v0.2.5/* https://pyo3.github.io/pyo3/v0.2.5/:splat 200
/v0.2.6/doc/* https://docs.rs/pyo3/0.2.6/:splat
/v0.2.6 /v0.2.6/
/v0.2.6/* https://pyo3.github.io/pyo3/v0.2.6/:splat 200
/v0.2.7/doc/* https://docs.rs/pyo3/0.2.7/:splat
/v0.2.7 /v0.2.7/
/v0.2.7/* https://pyo3.github.io/pyo3/v0.2.7/:splat 200
/v0.3.0/doc/* https://docs.rs/pyo3/0.3.0/:splat
/v0.3.0 /v0.3.0/
/v0.3.0/* https://pyo3.github.io/pyo3/v0.3.0/:splat 200
/v0.3.1/doc/* https://docs.rs/pyo3/0.3.1/:splat
/v0.3.1 /v0.3.1/
/v0.3.1/* https://pyo3.github.io/pyo3/v0.3.1/:splat 200
/v0.3.2/doc/* https://docs.rs/pyo3/0.3.2/:splat
/v0.3.2 /v0.3.2/
/v0.3.2/* https://pyo3.github.io/pyo3/v0.3.2/:splat 200
/v0.4.0/doc/* https://docs.rs/pyo3/0.4.0/:splat
/v0.4.0 /v0.4.0/
/v0.4.0/* https://pyo3.github.io/pyo3/v0.4.0/:splat 200
/v0.4.1/doc/* https://docs.rs/pyo3/0.4.1/:splat
/v0.4.1 /v0.4.1/
/v0.4.1/* https://pyo3.github.io/pyo3/v0.4.1/:splat 200
/v0.5.0/doc/* https://docs.rs/pyo3/0.5.0/:splat
/v0.5.0 /v0.5.0/
/v0.5.0/* https://pyo3.github.io/pyo3/v0.5.0/:splat 200
/v0.5.0-alpha.2/doc/* https://docs.rs/pyo3/0.5.0-alpha.2/:splat
/v0.5.0-alpha.2 /v0.5.0-alpha.2/
/v0.5.0-alpha.2/* https://pyo3.github.io/pyo3/v0.5.0-alpha.2/:splat 200
/v0.5.0-alpha.3/doc/* https://docs.rs/pyo3/0.5.0-alpha.3/:splat
/v0.5.0-alpha.3 /v0.5.0-alpha.3/
/v0.5.0-alpha.3/* https://pyo3.github.io/pyo3/v0.5.0-alpha.3/:splat 200
/v0.5.1/doc/* https://docs.rs/pyo3/0.5.1/:splat
/v0.5.1 /v0.5.1/
/v0.5.1/* https://pyo3.github.io/pyo3/v0.5.1/:splat 200
/v0.5.2/doc/* https://docs.rs/pyo3/0.5.2/:splat
/v0.5.2 /v0.5.2/
/v0.5.2/* https://pyo3.github.io/pyo3/v0.5.2/:splat 200
/v0.5.3/doc/* https://docs.rs/pyo3/0.5.3/:splat
/v0.5.3 /v0.5.3/
/v0.5.3/* https://pyo3.github.io/pyo3/v0.5.3/:splat 200
/v0.5.4/doc/* https://docs.rs/pyo3/0.5.4/:splat
/v0.5.4 /v0.5.4/
/v0.5.4/* https://pyo3.github.io/pyo3/v0.5.4/:splat 200
/v0.6.0/doc/* https://docs.rs/pyo3/0.6.0/:splat
/v0.6.0 /v0.6.0/
/v0.6.0/* https://pyo3.github.io/pyo3/v0.6.0/:splat 200
/v0.6.0-alpha.1/doc/* https://docs.rs/pyo3/0.6.0-alpha.1/:splat
/v0.6.0-alpha.1 /v0.6.0-alpha.1/
/v0.6.0-alpha.1/* https://pyo3.github.io/pyo3/v0.6.0-alpha.1/:splat 200
/v0.6.0-alpha.2/doc/* https://docs.rs/pyo3/0.6.0-alpha.2/:splat
/v0.6.0-alpha.2 /v0.6.0-alpha.2/
/v0.6.0-alpha.2/* https://pyo3.github.io/pyo3/v0.6.0-alpha.2/:splat 200
/v0.6.0-alpha.3/doc/* https://docs.rs/pyo3/0.6.0-alpha.3/:splat
/v0.6.0-alpha.3 /v0.6.0-alpha.3/
/v0.6.0-alpha.3/* https://pyo3.github.io/pyo3/v0.6.0-alpha.3/:splat 200
/v0.6.0-alpha.4/doc/* https://docs.rs/pyo3/0.6.0-alpha.4/:splat
/v0.6.0-alpha.4 /v0.6.0-alpha.4/
/v0.6.0-alpha.4/* https://pyo3.github.io/pyo3/v0.6.0-alpha.4/:splat 200
/v0.7.0/doc/* https://docs.rs/pyo3/0.7.0/:splat
/v0.7.0 /v0.7.0/
/v0.7.0/* https://pyo3.github.io/pyo3/v0.7.0/:splat 200
/v0.7.0-alpha.1/doc/* https://docs.rs/pyo3/0.7.0-alpha.1/:splat
/v0.7.0-alpha.1 /v0.7.0-alpha.1/
/v0.7.0-alpha.1/* https://pyo3.github.io/pyo3/v0.7.0-alpha.1/:splat 200
/v0.8.0/doc/* https://docs.rs/pyo3/0.8.0/:splat
/v0.8.0 /v0.8.0/
/v0.8.0/* https://pyo3.github.io/pyo3/v0.8.0/:splat 200
/v0.8.1/doc/* https://docs.rs/pyo3/0.8.1/:splat
/v0.8.1 /v0.8.1/
/v0.8.1/* https://pyo3.github.io/pyo3/v0.8.1/:splat 200
/v0.8.2/doc/* https://docs.rs/pyo3/0.8.2/:splat
/v0.8.2 /v0.8.2/
/v0.8.2/* https://pyo3.github.io/pyo3/v0.8.2/:splat 200
/v0.8.3/doc/* https://docs.rs/pyo3/0.8.3/:splat
/v0.8.3 /v0.8.3/
/v0.8.3/* https://pyo3.github.io/pyo3/v0.8.3/:splat 200
/v0.8.4/doc/* https://docs.rs/pyo3/0.8.4/:splat
/v0.8.4 /v0.8.4/
/v0.8.4/* https://pyo3.github.io/pyo3/v0.8.4/:splat 200
/v0.8.5/doc/* https://docs.rs/pyo3/0.8.5/:splat
/v0.8.5 /v0.8.5/
/v0.8.5/* https://pyo3.github.io/pyo3/v0.8.5/:splat 200
/v0.9.0/doc/* https://docs.rs/pyo3/0.9.0/:splat
/v0.9.0 /v0.9.0/
/v0.9.0/* https://pyo3.github.io/pyo3/v0.9.0/:splat 200
/v0.9.0-alpha.1/doc/* https://docs.rs/pyo3/0.9.0-alpha.1/:splat
/v0.9.0-alpha.1 /v0.9.0-alpha.1/
/v0.9.0-alpha.1/* https://pyo3.github.io/pyo3/v0.9.0-alpha.1/:splat 200
/v0.9.1/doc/* https://docs.rs/pyo3/0.9.1/:splat
/v0.9.1 /v0.9.1/
/v0.9.1/* https://pyo3.github.io/pyo3/v0.9.1/:splat 200
/v0.9.2/doc/* https://docs.rs/pyo3/0.9.2/:splat
/v0.9.2 /v0.9.2/
/v0.9.2/* https://pyo3.github.io/pyo3/v0.9.2/:splat 200
/dev/bench /dev/bench/
/dev/bench/* https://pyo3.github.io/pyo3/dev/bench/:splat 200

8
.netlify/create_redirects.py
View File

@ -12,8 +12,16 @@ def main() -> None:
versions = subprocess.check_output(["git", "tag"], text=True).splitlines()
for version in versions:
version_without_v = version.lstrip("v")
# redirect doc requests to docs.rs
print(f"/{version}/doc/* https://docs.rs/pyo3/{version_without_v}/:splat")
# guide doesn't render nicely if trailing slash missing
print(f"/{version} /{version}/")
# proxy guide to github-pages hosting
print(f"/{version}/* https://pyo3.github.io/pyo3/{version}/:splat 200")
# similar to guide, proxy benchmarks to github-pages hosting, add trailing
# slash.
print(f"/dev/bench /dev/bench/")
print(f"/dev/bench/* https://pyo3.github.io/pyo3/dev/bench/:splat 200")
if __name__ == "__main__":