From 6a97c8435e015432eadd6a4798200ceb996924ae Mon Sep 17 00:00:00 2001 From: konstin Date: Thu, 30 Apr 2020 14:36:01 +0200 Subject: [PATCH] Prepare 0.8.1 release --- Cargo.lock | 117 ++++++++++++++++++------------------------------- Cargo.toml | 38 ++++++++-------- pyproject.toml | 2 +- setup.py | 6 ++- 4 files changed, 68 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e8c8ff3e..72ea5f15a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,9 +223,9 @@ dependencies = [ [[package]] name = "cbindgen" -version = "0.13.2" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2db2df1ebc842c41fd2c4ae5b5a577faf63bd5151b953db752fc686812bee318" +checksum = "b15be43e426e5133330fffd63026e178e70ecc74df7a4a844a8ff6e6ffc2fcde" dependencies = [ "log", "proc-macro2", @@ -273,32 +273,16 @@ dependencies = [ "bitflags", ] -[[package]] -name = "core-foundation" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -dependencies = [ - "core-foundation-sys 0.6.2", - "libc", -] - [[package]] name = "core-foundation" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" dependencies = [ - "core-foundation-sys 0.7.0", + "core-foundation-sys", "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - [[package]] name = "core-foundation-sys" version = "0.7.0" @@ -768,9 +752,9 @@ checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" [[package]] name = "js-sys" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055" +checksum = "0b823ebafcee1632403f2782d28728aab353f7881547a700043ef455c078326f" dependencies = [ "wasm-bindgen", ] @@ -787,13 +771,13 @@ dependencies = [ [[package]] name = "keyring" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72604eaaa5dc7f4c85fb1c17337fcf5892ceec335c51a277df9f0db1a641111d" +checksum = "8835abb669913b7b2b01e12c8bab96d2b2578ee4b80cb997677465f8e6660323" dependencies = [ "byteorder", "secret-service", - "security-framework 0.3.4", + "security-framework", "winapi 0.3.8", ] @@ -826,7 +810,7 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "maturin" -version = "0.8.0" +version = "0.8.1" dependencies = [ "base64 0.12.0", "bytesize", @@ -1018,6 +1002,12 @@ dependencies = [ "libc", ] +[[package]] +name = "once_cell" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b" + [[package]] name = "opaque-debug" version = "0.2.3" @@ -1410,13 +1400,13 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.12" +version = "0.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba5a8ec64ee89a76c98c549af81ff14813df09c3e6dc4766c3856da48597a0c" +checksum = "703516ae74571f24b465b4a1431e81e2ad51336cb0ded733a55a1aa3eccac196" dependencies = [ "cc", - "lazy_static", "libc", + "once_cell", "spin", "untrusted", "web-sys", @@ -1461,7 +1451,7 @@ dependencies = [ "openssl-probe", "rustls", "schannel", - "security-framework 0.4.3", + "security-framework", ] [[package]] @@ -1535,18 +1525,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "security-framework" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" -dependencies = [ - "core-foundation 0.6.4", - "core-foundation-sys 0.6.2", - "libc", - "security-framework-sys 0.3.3", -] - [[package]] name = "security-framework" version = "0.4.3" @@ -1554,19 +1532,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" dependencies = [ "bitflags", - "core-foundation 0.7.0", - "core-foundation-sys 0.7.0", + "core-foundation", + "core-foundation-sys", "libc", - "security-framework-sys 0.4.3", -] - -[[package]] -name = "security-framework-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -dependencies = [ - "core-foundation-sys 0.6.2", + "security-framework-sys", ] [[package]] @@ -1575,7 +1544,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" dependencies = [ - "core-foundation-sys 0.7.0", + "core-foundation-sys", "libc", ] @@ -1617,9 +1586,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9" +checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" dependencies = [ "itoa", "ryu", @@ -1809,9 +1778,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d9c43f1bb96970e153bcbae39a65e249ccb942bd9d36dbdf086024920417c9c" +checksum = "05c1d570eb1a36f0345a5ce9c6c6e665b70b73d11236912c0b477616aeec47b1" dependencies = [ "bytes", "fnv", @@ -1931,9 +1900,9 @@ checksum = "63f18aa3b0e35fed5a0048f029558b1518095ffe2a0a31fb87c93dece93a4993" [[package]] name = "untrusted" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" @@ -1996,9 +1965,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasm-bindgen" -version = "0.2.60" +version = "0.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f" +checksum = "f56e97dbea16d5f56549d6c8ea7f36efb6be98507308650c1a5970574b3941b9" dependencies = [ "cfg-if", "serde", @@ -2008,9 +1977,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.60" +version = "0.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd" +checksum = "7b75d4f3f9b81dfc7d66b955876b325b20e8affd4ce8d93e51162626fc5faadb" dependencies = [ "bumpalo", "lazy_static", @@ -2023,9 +1992,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add542ea1ac7fdaa9dc25e031a6af33b7d63376292bd24140c637d00d1c312a" +checksum = "736dcd8f8455458c82614f12116aabd0209d440c1a28d8824bcaed755ac3e058" dependencies = [ "cfg-if", "js-sys", @@ -2035,9 +2004,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.60" +version = "0.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4" +checksum = "9dcde4b19e863521c1e78ecf100935132396291b09ae0ae2e155ff84ccbe9736" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2045,9 +2014,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.60" +version = "0.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931" +checksum = "13d87d2b117af2b86472402d70f7eb173bbe166beb5e727f3c0bebecdf356504" dependencies = [ "proc-macro2", "quote", @@ -2058,15 +2027,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.60" +version = "0.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639" +checksum = "71f77b681efd0bca6f8ea356cdc2e497538b41d3e2a02afed18ce8f022231d29" [[package]] name = "web-sys" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb" +checksum = "07c5819dc39222a788ca169a81aef7d02739019256300534f493b5747d5469c2" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 10d4bcc32..0574f2f27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["konstin "] name = "maturin" -version = "0.8.0" +version = "0.8.1" description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" exclude = ["test-crates/**/*", "sysconfig/*", "test-data/*", "ci/*", "tests/*"] readme = "Readme.md" @@ -34,34 +34,34 @@ name = "maturin" [dependencies] base64 = "0.12.0" bytesize = "1.0.0" -glob = "0.3" +glob = "0.3.0" cargo_metadata = "0.9.1" -cbindgen = { version = "0.13.1", default-features = false } +cbindgen = { version = "0.14.1", default-features = false } digest = { version = "0.8.1", features = ["std"] } -failure = "0.1.6" -flate2 = "1.0.12" -goblin = "0.2.0" -human-panic = { version = "1.0.1", optional = true } -keyring = { version = "0.8.0", optional = true } +failure = "0.1.7" +flate2 = "1.0.14" +goblin = "0.2.1" +human-panic = { version = "1.0.3", optional = true } +keyring = { version = "0.9.0", optional = true } platform-info = "0.0.1" platforms = "0.2.1" pretty_env_logger = { version = "0.4.0", optional = true } -regex = "1.2.1" -reqwest = { version = "0.10.3", optional = true, default-features = false, features = ["blocking"]} -rpassword = { version = "4.0.1", optional = true } -serde = { version = "1.0.103", features = ["derive"] } -serde_json = "1.0.42" -sha2 = "0.8.0" +regex = "1.3.7" +reqwest = { version = "0.10.4", optional = true, default-features = false, features = ["blocking"] } +rpassword = { version = "4.0.5", optional = true } +serde = { version = "1.0.106", features = ["derive"] } +serde_json = "1.0.52" +sha2 = "0.8.1" shlex = "0.1.1" -structopt = "0.3.5" +structopt = "0.3.14" tar = "0.4.26" tempfile = "3.1.0" -toml = "0.5.5" -walkdir = "2.2.8" -zip = "0.5.2" +toml = "0.5.6" +walkdir = "2.3.1" +zip = "0.5.5" [dev-dependencies] -indoc = "0.3.3" +indoc = "0.3.5" [features] default = ["auditwheel", "log", "upload", "rustls"] diff --git a/pyproject.toml b/pyproject.toml index 26d4caf0a..bcb6da2db 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ # Workaround to bootstrap maturin on non-manylinux platforms [build-system] -requires = ["setuptools~=41.2.0", "wheel~=0.33.6"] +requires = ["setuptools~=41.2.0", "wheel~=0.33.6", "toml~=0.10.0"] build-backend = "setuptools.build_meta" [tool.maturin] diff --git a/setup.py b/setup.py index e7a5875a3..06b76d563 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,7 @@ import subprocess import sys +import toml from setuptools import setup from setuptools.command.install import install @@ -74,6 +75,9 @@ def run(self): with open("Readme.md") as fp: long_description = fp.read() +with open("Cargo.toml") as fp: + version = toml.load(fp)["package"]["version"] + setup( name="maturin", author="konstin", @@ -83,7 +87,7 @@ def run(self): "python packages", long_description=long_description, long_description_content_type="text/markdown", - version="0.8.0", + version=version, license="MIT OR Apache-2.0", python_requires=">=3.5", cmdclass={"install": PostInstallCommand, "bdist_wheel": bdist_wheel},