From c4382e38a1f281733e203bc02c6e367f99bd9150 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 23 Dec 2020 10:08:38 +1000 Subject: [PATCH] update to stable pyo3 0.13 release --- Cargo.lock | 25 ++++++----- cargo/crates.bzl | 42 +++++++++---------- cargo/licenses.json | 24 +++++------ ...3-0.12.4.bazel => BUILD.pyo3-0.13.0.bazel} | 10 ++--- ...4.bazel => BUILD.pyo3-macros-0.13.0.bazel} | 8 ++-- ...=> BUILD.pyo3-macros-backend-0.13.0.bazel} | 6 +-- cargo/update.py | 2 - pylib/rsbridge/Cargo.toml | 3 +- pylib/rsbridge/cargo/BUILD.bazel | 2 +- 9 files changed, 61 insertions(+), 61 deletions(-) rename cargo/remote/{BUILD.pyo3-0.12.4.bazel => BUILD.pyo3-0.13.0.bazel} (96%) rename cargo/remote/{BUILD.pyo3cls-0.12.4.bazel => BUILD.pyo3-macros-0.13.0.bazel} (87%) rename cargo/remote/{BUILD.pyo3-derive-backend-0.12.4.bazel => BUILD.pyo3-macros-backend-0.13.0.bazel} (90%) diff --git a/Cargo.lock b/Cargo.lock index f3196c1e2..af6316b80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1580,8 +1580,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.12.4" -source = "git+https://github.com/PyO3/pyo3.git?rev=92b7a9736c9585883df5ec5bc01004caa7f65106#92b7a9736c9585883df5ec5bc01004caa7f65106" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436" dependencies = [ "cfg-if 1.0.0", "ctor", @@ -1590,26 +1591,28 @@ dependencies = [ "libc", "parking_lot", "paste", - "pyo3cls", + "pyo3-macros", "unindent", ] [[package]] -name = "pyo3-derive-backend" -version = "0.12.4" -source = "git+https://github.com/PyO3/pyo3.git?rev=92b7a9736c9585883df5ec5bc01004caa7f65106#92b7a9736c9585883df5ec5bc01004caa7f65106" +name = "pyo3-macros" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16" dependencies = [ - "proc-macro2", + "pyo3-macros-backend", "quote", "syn", ] [[package]] -name = "pyo3cls" -version = "0.12.4" -source = "git+https://github.com/PyO3/pyo3.git?rev=92b7a9736c9585883df5ec5bc01004caa7f65106#92b7a9736c9585883df5ec5bc01004caa7f65106" +name = "pyo3-macros-backend" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2" dependencies = [ - "pyo3-derive-backend", + "proc-macro2", "quote", "syn", ] diff --git a/cargo/crates.bzl b/cargo/crates.bzl index 248073d13..43c2364e0 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -1652,33 +1652,33 @@ def raze_fetch_remote_crates(): ) maybe( - new_git_repository, - name = "raze__pyo3__0_12_4", - remote = "https://github.com/PyO3/pyo3.git", - shallow_since = "1606725379 +0000", - commit = "92b7a9736c9585883df5ec5bc01004caa7f65106", - build_file = Label("//cargo/remote:BUILD.pyo3-0.12.4.bazel"), - init_submodules = True, + http_archive, + name = "raze__pyo3__0_13_0", + url = "https://crates.io/api/v1/crates/pyo3/0.13.0/download", + type = "tar.gz", + sha256 = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436", + strip_prefix = "pyo3-0.13.0", + build_file = Label("//cargo/remote:BUILD.pyo3-0.13.0.bazel"), ) maybe( - new_git_repository, - name = "raze__pyo3_derive_backend__0_12_4", - remote = "https://github.com/PyO3/pyo3.git", - shallow_since = "1606725379 +0000", - commit = "92b7a9736c9585883df5ec5bc01004caa7f65106", - build_file = Label("//cargo/remote:BUILD.pyo3-derive-backend-0.12.4.bazel"), - init_submodules = True, + http_archive, + name = "raze__pyo3_macros__0_13_0", + url = "https://crates.io/api/v1/crates/pyo3-macros/0.13.0/download", + type = "tar.gz", + sha256 = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16", + strip_prefix = "pyo3-macros-0.13.0", + build_file = Label("//cargo/remote:BUILD.pyo3-macros-0.13.0.bazel"), ) maybe( - new_git_repository, - name = "raze__pyo3cls__0_12_4", - remote = "https://github.com/PyO3/pyo3.git", - shallow_since = "1606725379 +0000", - commit = "92b7a9736c9585883df5ec5bc01004caa7f65106", - build_file = Label("//cargo/remote:BUILD.pyo3cls-0.12.4.bazel"), - init_submodules = True, + http_archive, + name = "raze__pyo3_macros_backend__0_13_0", + url = "https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.0/download", + type = "tar.gz", + sha256 = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2", + strip_prefix = "pyo3-macros-backend-0.13.0", + build_file = Label("//cargo/remote:BUILD.pyo3-macros-backend-0.13.0.bazel"), ) maybe( diff --git a/cargo/licenses.json b/cargo/licenses.json index f2cc07379..cce9f5a47 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -1495,7 +1495,7 @@ }, { "name": "pyo3", - "version": "0.12.4", + "version": "0.13.0", "authors": "PyO3 Project and Contributors ", "repository": "https://github.com/pyo3/pyo3", "license": "Apache-2.0", @@ -1503,23 +1503,23 @@ "description": "Bindings to Python interpreter" }, { - "name": "pyo3-derive-backend", - "version": "0.12.4", - "authors": "PyO3 Project and Contributors ", - "repository": "https://github.com/pyo3/pyo3", - "license": "Apache-2.0", - "license_file": null, - "description": "Code generation for PyO3 package" - }, - { - "name": "pyo3cls", - "version": "0.12.4", + "name": "pyo3-macros", + "version": "0.13.0", "authors": "PyO3 Project and Contributors ", "repository": "https://github.com/pyo3/pyo3", "license": "Apache-2.0", "license_file": null, "description": "Proc macros for PyO3 package" }, + { + "name": "pyo3-macros-backend", + "version": "0.13.0", + "authors": "PyO3 Project and Contributors ", + "repository": "https://github.com/pyo3/pyo3", + "license": "Apache-2.0", + "license_file": null, + "description": "Code generation for PyO3 package" + }, { "name": "quote", "version": "1.0.8", diff --git a/cargo/remote/BUILD.pyo3-0.12.4.bazel b/cargo/remote/BUILD.pyo3-0.13.0.bazel similarity index 96% rename from cargo/remote/BUILD.pyo3-0.12.4.bazel rename to cargo/remote/BUILD.pyo3-0.13.0.bazel index 1a6878e8c..6a688ea2b 100644 --- a/cargo/remote/BUILD.pyo3-0.12.4.bazel +++ b/cargo/remote/BUILD.pyo3-0.13.0.bazel @@ -49,7 +49,7 @@ cargo_build_script( "inventory", "macros", "paste", - "pyo3cls", + "pyo3-macros", "unindent", ], crate_root = "build.rs", @@ -62,7 +62,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", visibility = ["//visibility:private"], deps = [ ], @@ -92,7 +92,7 @@ rust_library( "inventory", "macros", "paste", - "pyo3cls", + "pyo3-macros", "unindent", ], crate_root = "src/lib.rs", @@ -104,7 +104,7 @@ rust_library( "@raze__ctor__0_1_16//:ctor", "@raze__indoc__1_0_3//:indoc", "@raze__paste__1_0_4//:paste", - "@raze__pyo3cls__0_12_4//:pyo3cls", + "@raze__pyo3_macros__0_13_0//:pyo3_macros", ], rustc_flags = [ "--cap-lints=allow", @@ -113,7 +113,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", # buildifier: leave-alone deps = [ ":pyo3_build_script", diff --git a/cargo/remote/BUILD.pyo3cls-0.12.4.bazel b/cargo/remote/BUILD.pyo3-macros-0.13.0.bazel similarity index 87% rename from cargo/remote/BUILD.pyo3cls-0.12.4.bazel rename to cargo/remote/BUILD.pyo3-macros-0.13.0.bazel index bc25816f1..043634b82 100644 --- a/cargo/remote/BUILD.pyo3cls-0.12.4.bazel +++ b/cargo/remote/BUILD.pyo3-macros-0.13.0.bazel @@ -31,11 +31,11 @@ licenses([ # Generated Targets rust_library( - name = "pyo3cls", + name = "pyo3_macros", srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "pyo3cls/src/lib.rs", + crate_root = "src/lib.rs", crate_type = "proc-macro", data = [], edition = "2018", @@ -46,10 +46,10 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", # buildifier: leave-alone deps = [ - "@raze__pyo3_derive_backend__0_12_4//:pyo3_derive_backend", + "@raze__pyo3_macros_backend__0_13_0//:pyo3_macros_backend", "@raze__quote__1_0_8//:quote", "@raze__syn__1_0_55//:syn", ], diff --git a/cargo/remote/BUILD.pyo3-derive-backend-0.12.4.bazel b/cargo/remote/BUILD.pyo3-macros-backend-0.13.0.bazel similarity index 90% rename from cargo/remote/BUILD.pyo3-derive-backend-0.12.4.bazel rename to cargo/remote/BUILD.pyo3-macros-backend-0.13.0.bazel index a77574ff5..1545f8a56 100644 --- a/cargo/remote/BUILD.pyo3-derive-backend-0.12.4.bazel +++ b/cargo/remote/BUILD.pyo3-macros-backend-0.13.0.bazel @@ -31,11 +31,11 @@ licenses([ # Generated Targets rust_library( - name = "pyo3_derive_backend", + name = "pyo3_macros_backend", srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "pyo3-derive-backend/src/lib.rs", + crate_root = "src/lib.rs", crate_type = "lib", data = [], edition = "2018", @@ -46,7 +46,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", diff --git a/cargo/update.py b/cargo/update.py index 7ab683d67..62958b7c3 100644 --- a/cargo/update.py +++ b/cargo/update.py @@ -19,8 +19,6 @@ COMMITS_SHALLOW_SINCE = { "96e1358555c49905de89170f2b1102a7d8b6c4c2": "1598411535 +1000", # prost "4ded4a98ef339da0b7babd4efee3fbe8adaf746b": "1598739849 -0700", - # pyo3 - "92b7a9736c9585883df5ec5bc01004caa7f65106": "1606725379 +0000", } import os diff --git a/pylib/rsbridge/Cargo.toml b/pylib/rsbridge/Cargo.toml index 0bccffb81..bc76b4cd3 100644 --- a/pylib/rsbridge/Cargo.toml +++ b/pylib/rsbridge/Cargo.toml @@ -11,8 +11,7 @@ anki = { path = "../../rslib" } # /cargo/update.py needs to be run if updating the version below [dependencies.pyo3] -git = "https://github.com/PyO3/pyo3.git" -rev = "92b7a9736c9585883df5ec5bc01004caa7f65106" +version = "0.13" features = ["extension-module", "abi3"] [lib] diff --git a/pylib/rsbridge/cargo/BUILD.bazel b/pylib/rsbridge/cargo/BUILD.bazel index 61ed03e85..f4c169ae5 100644 --- a/pylib/rsbridge/cargo/BUILD.bazel +++ b/pylib/rsbridge/cargo/BUILD.bazel @@ -14,7 +14,7 @@ licenses([ # Aliased targets alias( name = "pyo3", - actual = "@raze__pyo3__0_12_4//:pyo3", + actual = "@raze__pyo3__0_13_0//:pyo3", tags = [ "cargo-raze", "manual",