Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-maturin for openSUSE:Factory checked in at 2022-10-25 11:19:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-maturin (Old) and /work/SRC/openSUSE:Factory/.python-maturin.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-maturin" Tue Oct 25 11:19:45 2022 rev:17 rq:1030882 version:0.13.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-maturin/python-maturin.changes 2022-09-30 17:57:49.753253071 +0200 +++ /work/SRC/openSUSE:Factory/.python-maturin.new.2275/python-maturin.changes 2022-10-25 11:19:47.930108910 +0200 @@ -1,0 +2,19 @@ +Mon Oct 24 12:24:47 UTC 2022 - Matej Cepl <[email protected]> + +- Upgrade to 0.13.6: + - Add cargo-deny integration + - Fix maturin develop in Windows conda virtual environment + - Filter out unwanted Cargo target kinds when determine bridge + model + - Add maturin develop test case for conda + - Bump console from 0.15.1 to 0.15.2 + - Bump thiserror from 1.0.36 to 1.0.37 + - [StepSecurity] ci: Harden GitHub Actions + - Downgrade indicatif to fix build on some 32-bit platforms + - Allow rustix dependency now that Alpine removed thumb-mode on + armv7l + - Bump textwrap from 0.15.0 to 0.15.1 + - Replace pretty_env_logger with tracing-subscriber + - Include Cargo.lock by default in source distribution + +------------------------------------------------------------------- Old: ---- maturin-0.13.5.tar.gz New: ---- maturin-0.13.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-maturin.spec ++++++ --- /var/tmp/diff_new_pack.LewN0z/_old 2022-10-25 11:19:49.178111676 +0200 +++ /var/tmp/diff_new_pack.LewN0z/_new 2022-10-25 11:19:49.186111694 +0200 @@ -17,7 +17,7 @@ Name: python-maturin -Version: 0.13.5 +Version: 0.13.6 Release: 0 Summary: Rust/Python Interoperability License: Apache-2.0 OR MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.LewN0z/_old 2022-10-25 11:19:49.222111774 +0200 +++ /var/tmp/diff_new_pack.LewN0z/_new 2022-10-25 11:19:49.226111783 +0200 @@ -1,6 +1,6 @@ <services> <service name="cargo_vendor" mode="disabled"> - <param name="srctar">maturin-0.13.5.tar.gz</param> + <param name="srcdir">maturin</param> <param name="compression">xz</param> <param name="update">true</param> </service> ++++++ maturin-0.13.5.tar.gz -> maturin-0.13.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/Cargo.lock new/maturin-0.13.6/Cargo.lock --- old/maturin-0.13.5/Cargo.lock 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/Cargo.lock 2022-10-08 06:31:04.000000000 +0200 @@ -254,9 +254,9 @@ [[package]] name = "cargo-xwin" -version = "0.10.4" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f2ba119cbe3998beb157dff447d37fd845aa728b40c7ce9bcc472e486679ee1e" +checksum = "0b4d44af0e3fdd773cbf70b6b826a28993839be0a36c2b7c00c47f2dadaca6c6" dependencies = [ "anyhow", "cargo-options", @@ -335,7 +335,7 @@ dependencies = [ "byteorder", "fnv", - "uuid 1.1.2", + "uuid 1.2.0", ] [[package]] @@ -371,9 +371,9 @@ [[package]] name = "clap" -version = "3.2.21" +version = "3.2.22" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" dependencies = [ "atty", "bitflags", @@ -383,7 +383,7 @@ "once_cell", "strsim", "termcolor", - "terminal_size", + "terminal_size 0.2.1", "textwrap", ] @@ -465,14 +465,14 @@ [[package]] name = "console" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", - "terminal_size", + "terminal_size 0.1.17", "unicode-width", "winapi", ] @@ -534,26 +534,24 @@ [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -659,9 +657,9 @@ [[package]] name = "dunce" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" [[package]] name = "either" @@ -770,16 +768,24 @@ ] [[package]] -name = "env_logger" -version = "0.7.1" +name = "errno" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -1079,15 +1085,6 @@ ] [[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] name = "idna" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1127,9 +1124,9 @@ [[package]] name = "indicatif" -version = "0.17.1" +version = "0.17.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "bfddc9561e8baf264e0e45e197fd7696320026eb10a8180340debc27b18f535b" +checksum = "2946516aa80379c1e6ee9cfa75a7b2faf23f63690f44d682e7fecd0141bbcaf2" dependencies = [ "console", "number_prefix", @@ -1152,6 +1149,12 @@ ] [[package]] +name = "io-lifetimes" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1162,9 +1165,9 @@ [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "js-sys" @@ -1206,9 +1209,15 @@ [[package]] name = "libc" -version = "0.2.133" +version = "0.2.134" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" + +[[package]] +name = "linux-raw-sys" +version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "lock_api" @@ -1257,7 +1266,7 @@ [[package]] name = "maturin" -version = "0.13.5" +version = "0.13.6" dependencies = [ "anyhow", "base64", @@ -1293,7 +1302,6 @@ "pep440", "platform-info", "pretty_assertions", - "pretty_env_logger", "pyproject-toml", "python-pkginfo", "regex", @@ -1311,6 +1319,7 @@ "thiserror", "toml_edit", "tracing", + "tracing-subscriber", "ureq", "zip", ] @@ -1373,7 +1382,7 @@ "byteorder", "cfb", "encoding", - "uuid 1.1.2", + "uuid 1.2.0", ] [[package]] @@ -1431,6 +1440,16 @@ ] [[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] name = "num" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1615,9 +1634,9 @@ [[package]] name = "os_type" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c3df761f6470298359f84fcfb60d86db02acc22c251c37265c07a3d1057d2389" +checksum = "e24d44c0eea30167516ed8f6daca4b5e3eebcde1bde1e4e6e08b809fb02c7ba5" dependencies = [ "regex", ] @@ -1632,6 +1651,12 @@ ] [[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] name = "parking" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1749,16 +1774,6 @@ ] [[package]] -name = "pretty_env_logger" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" -dependencies = [ - "env_logger", - "log", -] - -[[package]] name = "proc-macro-crate" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1804,9 +1819,9 @@ [[package]] name = "proc-macro2" -version = "1.0.44" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ "unicode-ident", ] @@ -1837,12 +1852,6 @@ ] [[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] name = "quote" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2020,6 +2029,20 @@ ] [[package]] +name = "rustix" +version = "0.35.11" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] name = "rustls" version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2242,9 +2265,9 @@ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smawk" @@ -2299,9 +2322,9 @@ [[package]] name = "syn" -version = "1.0.101" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" dependencies = [ "proc-macro2", "quote", @@ -2359,31 +2382,41 @@ ] [[package]] +name = "terminal_size" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "8440c860cf79def6164e4a0a983bcc2305d82419177a0e0c71930d049e3ac5a1" +dependencies = [ + "rustix", + "windows-sys", +] + +[[package]] name = "textwrap" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" dependencies = [ "smawk", - "terminal_size", + "terminal_size 0.2.1", "unicode-linebreak", "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -2401,9 +2434,9 @@ [[package]] name = "time" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" dependencies = [ "itoa", "libc", @@ -2455,9 +2488,9 @@ [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", @@ -2467,9 +2500,9 @@ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", @@ -2478,15 +2511,26 @@ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", ] [[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] name = "tracing-serde" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2498,19 +2542,22 @@ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ "matchers", + "nu-ansi-term", "once_cell", "regex", "serde", "serde_json", "sharded-slab", + "smallvec", "thread_local", "tracing", "tracing-core", + "tracing-log", "tracing-serde", ] @@ -2554,9 +2601,9 @@ [[package]] name = "unicode-linebreak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "ba853b89cad55680dd3cf06f2798cb1ad8d483f0e2dfa14138d7e789ecee5c4e" +checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ "hashbrown", "regex", @@ -2624,9 +2671,9 @@ [[package]] name = "uuid" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "683f0a095f6dcf74520a5f17a12452ae6f970abbd2443299a1e226fd38195f2b" [[package]] name = "valuable" @@ -2857,9 +2904,9 @@ [[package]] name = "xwin" -version = "0.2.8" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "19d800084cf7137e4a3e80587ff027d53943e05586a50a3655c2622e6700ba3f" +checksum = "3f66ef70cc262a6da73cb13fae0c767add6bd0b85fa46053b263732fecfb9b9f" dependencies = [ "anyhow", "bytes", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/Cargo.toml new/maturin-0.13.6/Cargo.toml --- old/maturin-0.13.5/Cargo.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/maturin-0.13.6/Cargo.toml 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +1,7 @@ [package] authors = ["konstin <[email protected]>", "messense <[email protected]>"] name = "maturin" -version = "0.13.5" +version = "0.13.6" 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/*", "guide/*", ".github/*"] homepage = "https://github.com/pyo3/maturin"; @@ -26,14 +26,13 @@ cargo_metadata = "0.15.0" cargo-options = "0.3.1" cargo-zigbuild = "0.12.3" -cargo-xwin = { version = "0.10.4", default-features = false } +cargo-xwin = { version = "=0.10.2", default-features = false } cbindgen = { version = "0.24.2", default-features = false } flate2 = "1.0.18" goblin = "0.5.4" human-panic = { version = "1.0.3", optional = true } keyring = { version = "1.1.1", optional = true } platform-info = "1.0.0" -pretty_env_logger = { version = "0.4.0", optional = true } regex = "1.4.5" serde = { version = "1.0.141", features = ["derive"] } serde_json = "1.0.80" @@ -42,7 +41,7 @@ tempfile = "3.2.0" toml_edit = { version = "0.14.3", features = ["easy"] } zip = { version = "0.6.1", default-features = false, features = ["bzip2", "deflate", "time"] } -thiserror = "1.0.33" +thiserror = "1.0.37" dirs = "4.0.0" fs-err = "2.5.0" fat-macho = { version = "0.4.5", default-features = false } @@ -52,10 +51,10 @@ target-lexicon = "0.12.0" pyproject-toml = "0.3.0" python-pkginfo = "0.5.4" -textwrap = "0.15.0" +textwrap = "0.15.1" ignore = "0.4.18" dialoguer = { version = "0.10.2", default-features = false } -console = "0.15.0" +console = "0.15.2" minijinja = "0.20.0" lddtree = "0.3.1" cc = "1.0.72" @@ -63,6 +62,7 @@ clap_complete = "3.1.3" clap_complete_fig = "3.1.0" tracing = "0.1.36" +tracing-subscriber = { version = "0.3.15", features = ["env-filter"], optional = true } dunce = "1.0.2" pep440 = "0.2.0" @@ -84,7 +84,7 @@ default = ["log", "upload", "rustls", "human-panic"] upload = ["ureq", "multipart", "rpassword", "configparser", "bytesize"] password-storage = ["upload", "keyring"] -log = ["pretty_env_logger"] +log = ["tracing-subscriber"] rustls = ["ureq/tls", "cargo-xwin/rustls-tls"] native-tls = ["ureq/native-tls", "native-tls-crate", "cargo-xwin/native-tls"] # Internal feature to speed up the tests significantly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/Changelog.md new/maturin-0.13.6/Changelog.md --- old/maturin-0.13.5/Changelog.md 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/Changelog.md 2022-10-08 06:31:04.000000000 +0200 @@ -7,6 +7,13 @@ ## [Unreleased] +## [0.13.6] - 2022-10-08 + +* Fix `maturin develop` in Windows conda virtual environment in [#1146](https://github.com/PyO3/maturin/pull/1146) +* Fix build for crate using `pyo3` and `build.rs` without `cdylib` crate type in [#1150](https://github.com/PyO3/maturin/pull/1150) +* Fix build on some 32-bit platform by downgrading `indicatif` in [#1163](https://github.com/PyO3/maturin/pull/1163) +* Include `Cargo.lock` by default in source distribution in [#1170](https://github.com/PyO3/maturin/pull/1170) + ## [0.13.5] - 2022-09-27 * Fix resolving crate name bug in [#1142](https://github.com/PyO3/maturin/pull/1142) @@ -710,7 +717,8 @@ * Initial Release -[Unreleased]: https://github.com/pyo3/maturin/compare/v0.13.5...HEAD +[Unreleased]: https://github.com/pyo3/maturin/compare/v0.13.6...HEAD +[0.13.6]: https://github.com/pyo3/maturin/compare/v0.13.5...v0.13.6 [0.13.5]: https://github.com/pyo3/maturin/compare/v0.13.4...v0.13.5 [0.13.4]: https://github.com/pyo3/maturin/compare/v0.13.3...v0.13.4 [0.13.3]: https://github.com/pyo3/maturin/compare/v0.13.2...v0.13.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/PKG-INFO new/maturin-0.13.6/PKG-INFO --- old/maturin-0.13.5/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/maturin-0.13.6/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: maturin -Version: 0.13.5 +Version: 0.13.6 Classifier: Topic :: Software Development :: Build Tools Classifier: Programming Language :: Rust Classifier: Programming Language :: Python :: Implementation :: CPython @@ -18,21 +18,21 @@ License: MIT OR Apache-2.0 Requires-Python: >=3.7 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM -Project-URL: Changelog, https://maturin.rs/changelog.html -Project-URL: Issues, https://github.com/PyO3/maturin/issues Project-URL: Documentation, https://maturin.rs +Project-URL: Issues, https://github.com/PyO3/maturin/issues +Project-URL: Changelog, https://maturin.rs/changelog.html Project-URL: Source Code, https://github.com/PyO3/maturin # Maturin _formerly pyo3-pack_ -[](https://github.com/PyO3/maturin/actions) -[](https://cirrus-ci.com/github/PyO3/maturin) -[](https://crates.io/crates/maturin) -[](https://pypi.org/project/maturin/) -[](https://maturin.rs/) -[](https://gitter.im/PyO3/Lobby) +[](https://github.com/PyO3/maturin/actions) +[](https://cirrus-ci.com/github/PyO3/maturin) +[](https://crates.io/crates/maturin) +[](https://pypi.org/project/maturin) +[](https://maturin.rs) +[](https://gitter.im/PyO3/Lobby) Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/Readme.md new/maturin-0.13.6/Readme.md --- old/maturin-0.13.5/Readme.md 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/Readme.md 2022-10-08 06:31:04.000000000 +0200 @@ -2,12 +2,12 @@ _formerly pyo3-pack_ -[](https://github.com/PyO3/maturin/actions) -[](https://cirrus-ci.com/github/PyO3/maturin) -[](https://crates.io/crates/maturin) -[](https://pypi.org/project/maturin/) -[](https://maturin.rs/) -[](https://gitter.im/PyO3/Lobby) +[](https://github.com/PyO3/maturin/actions) +[](https://cirrus-ci.com/github/PyO3/maturin) +[](https://crates.io/crates/maturin) +[](https://pypi.org/project/maturin) +[](https://maturin.rs) +[](https://gitter.im/PyO3/Lobby) Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/deny.toml new/maturin-0.13.6/deny.toml --- old/maturin-0.13.5/deny.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/maturin-0.13.6/deny.toml 2022-10-08 06:31:04.000000000 +0200 @@ -0,0 +1,208 @@ +# This template contains all of the possible sections and their default values + +# Note that all fields that take a lint level have these possible values: +# * deny - An error will be produced and the check will fail +# * warn - A warning will be produced, but the check will not fail +# * allow - No warning or error will be produced, though in some cases a note +# will be + +# The values provided in this template are the default values that will be used +# when any section or field is not specified in your own configuration + +# If 1 or more target triples (and optionally, target_features) are specified, +# only the specified targets will be checked when running `cargo deny check`. +# This means, if a particular package is only ever used as a target specific +# dependency, such as, for example, the `nix` crate only being used via the +# `target_family = "unix"` configuration, that only having windows targets in +# this list would mean the nix crate, as well as any of its exclusive +# dependencies not shared by any other crates, would be ignored, as the target +# list here is effectively saying which targets you are building for. +targets = [ + # The triple can be any string, but only the target triples built in to + # rustc (as of 1.40) can be checked against actual config expressions + #{ triple = "x86_64-unknown-linux-musl" }, + # You can also specify which target_features you promise are enabled for a + # particular target. target_features are currently not validated against + # the actual valid features supported by the target architecture. + #{ triple = "wasm32-unknown-unknown", features = ["atomics"] }, +] + +# This section is considered when running `cargo deny check advisories` +# More documentation for the advisories section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html +[advisories] +# The path where the advisory database is cloned/fetched into +db-path = "~/.cargo/advisory-db" +# The url(s) of the advisory databases to use +db-urls = ["https://github.com/rustsec/advisory-db";] +# The lint level for security vulnerabilities +vulnerability = "deny" +# The lint level for unmaintained crates +unmaintained = "warn" +# The lint level for crates that have been yanked from their source registry +yanked = "warn" +# The lint level for crates with security notices. Note that as of +# 2019-12-17 there are no security notice advisories in +# https://github.com/rustsec/advisory-db +notice = "warn" +# A list of advisory IDs to ignore. Note that ignored advisories will still +# output a note when they are encountered. +ignore = [ + #"RUSTSEC-0000-0000", +] +# Threshold for security vulnerabilities, any vulnerability with a CVSS score +# lower than the range specified will be ignored. Note that ignored advisories +# will still output a note when they are encountered. +# * None - CVSS Score 0.0 +# * Low - CVSS Score 0.1 - 3.9 +# * Medium - CVSS Score 4.0 - 6.9 +# * High - CVSS Score 7.0 - 8.9 +# * Critical - CVSS Score 9.0 - 10.0 +#severity-threshold = + +# If this is true, then cargo deny will use the git executable to fetch advisory database. +# If this is false, then it uses a built-in git library. +# Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support. +# See Git Authentication for more information about setting up git authentication. +#git-fetch-with-cli = true + +# This section is considered when running `cargo deny check licenses` +# More documentation for the licenses section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html +[licenses] +# The lint level for crates which do not have a detectable license +unlicensed = "deny" +# List of explicitly allowed licenses +# See https://spdx.org/licenses/ for list of possible licenses +# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. +allow = [ + "MIT", + "Apache-2.0", + "Apache-2.0 WITH LLVM-exception", + "ISC", + "0BSD", + "BSD-3-Clause", + "CC0-1.0", +] +# List of explicitly disallowed licenses +# See https://spdx.org/licenses/ for list of possible licenses +# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. +deny = [ + #"Nokia", +] +# Lint level for licenses considered copyleft +copyleft = "warn" +# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses +# * both - The license will be approved if it is both OSI-approved *AND* FSF +# * either - The license will be approved if it is either OSI-approved *OR* FSF +# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF +# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved +# * neither - This predicate is ignored and the default lint level is used +allow-osi-fsf-free = "neither" +# Lint level used when no other predicates are matched +# 1. License isn't in the allow or deny lists +# 2. License isn't copyleft +# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither" +default = "deny" +# The confidence threshold for detecting a license from license text. +# The higher the value, the more closely the license text must be to the +# canonical license text of a valid SPDX license file. +# [possible values: any between 0.0 and 1.0]. +confidence-threshold = 0.8 +# Allow 1 or more licenses on a per-crate basis, so that particular licenses +# aren't accepted for every possible crate as with the normal allow list +exceptions = [ + # Each entry is the crate and version constraint, and its specific allow + # list + { allow = ["ISC", "MIT", "OpenSSL"], name = "ring" }, + { allow = ["MPL-2.0"], name = "webpki-roots" }, + { allow = ["MPL-2.0"], name = "cbindgen" }, + { allow = ["Unicode-DFS-2016"], name = "unicode-ident" }, + { allow = ["MIT", "LGPL-3.0"], name = "configparser" }, +] + +# Some crates don't have (easily) machine readable licensing information, +# adding a clarification entry for it allows you to manually specify the +# licensing information +[[licenses.clarify]] +name = "ring" +expression = "MIT AND ISC AND OpenSSL" +license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }] + +[licenses.private] +# If true, ignores workspace crates that aren't published, or are only +# published to private registries. +# To see how to mark a crate as unpublished (to the official registry), +# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field. +ignore = false +# One or more private registries that you might publish crates to, if a crate +# is only published to private registries, and ignore is true, the crate will +# not have its license(s) checked +registries = [ + #"https://sekretz.com/registry +] + +# This section is considered when running `cargo deny check bans`. +# More documentation about the 'bans' section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html +[bans] +# Lint level for when multiple versions of the same crate are detected +multiple-versions = "warn" +# Lint level for when a crate version requirement is `*` +wildcards = "allow" +# The graph highlighting used when creating dotgraphs for crates +# with multiple versions +# * lowest-version - The path to the lowest versioned duplicate is highlighted +# * simplest-path - The path to the version with the fewest edges is highlighted +# * all - Both lowest-version and simplest-path are used +highlight = "all" +# List of crates that are allowed. Use with care! +allow = [ + #{ name = "ansi_term", version = "=0.11.0" }, +] +# List of crates to deny +deny = [ + # Each entry the name of a crate and a version range. If version is + # not specified, all versions will be matched. + #{ name = "ansi_term", version = "=0.11.0" }, + # + # Wrapper crates can optionally be specified to allow the crate when it + # is a direct dependency of the otherwise banned crate + #{ name = "ansi_term", version = "=0.11.0", wrappers = [] }, + { name = "indicatif", version = ">=0.17.0" }, +] +# Certain crates/versions that will be skipped when doing duplicate detection. +skip = [ + #{ name = "ansi_term", version = "=0.11.0" }, +] +# Similarly to `skip` allows you to skip certain crates during duplicate +# detection. Unlike skip, it also includes the entire tree of transitive +# dependencies starting at the specified crate, up to a certain depth, which is +# by default infinite +skip-tree = [ + #{ name = "ansi_term", version = "=0.11.0", depth = 20 }, +] + +# This section is considered when running `cargo deny check sources`. +# More documentation about the 'sources' section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html +[sources] +# Lint level for what to happen when a crate from a crate registry that is not +# in the allow list is encountered +unknown-registry = "warn" +# Lint level for what to happen when a crate from a git repository that is not +# in the allow list is encountered +unknown-git = "warn" +# List of URLs for allowed crate registries. Defaults to the crates.io index +# if not specified. If it is specified but empty, no registries are allowed. +allow-registry = ["https://github.com/rust-lang/crates.io-index";] +# List of URLs for allowed Git repositories +allow-git = [] + +[sources.allow-org] +# 1 or more github.com organizations to allow git sources for +github = [] +# 1 or more gitlab.com organizations to allow git sources for +gitlab = [] +# 1 or more bitbucket.org organizations to allow git sources for +bitbucket = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/src/build_options.rs new/maturin-0.13.6/src/build_options.rs --- old/maturin-0.13.5/src/build_options.rs 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/src/build_options.rs 2022-10-08 06:31:04.000000000 +0200 @@ -861,6 +861,11 @@ let targets: Vec<_> = root_package .targets .iter() + .filter(|target| { + target.kind.iter().any(|kind| { + kind != "example" && kind != "test" && kind != "bench" && kind != "custom-build" + }) + }) .flat_map(|target| target.crate_types.iter()) .map(String::as_str) .collect(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/src/main.rs new/maturin-0.13.6/src/main.rs --- old/maturin-0.13.5/src/main.rs 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/src/main.rs 2022-10-08 06:31:04.000000000 +0200 @@ -307,7 +307,7 @@ fn run() -> Result<()> { #[cfg(feature = "log")] - pretty_env_logger::init(); + tracing_subscriber::fmt::init(); // Allow symlink `maturin` to `ar` to invoke `zig ar` // See https://github.com/messense/cargo-zigbuild/issues/52 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/src/module_writer.rs new/maturin-0.13.6/src/module_writer.rs --- old/maturin-0.13.5/src/module_writer.rs 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/src/module_writer.rs 2022-10-08 06:31:04.000000000 +0200 @@ -8,7 +8,7 @@ use fs_err::File; use ignore::WalkBuilder; use sha2::{Digest, Sha256}; -use std::collections::HashMap; +use std::collections::{HashMap, HashSet}; use std::ffi::OsStr; use std::fmt::Write as _; #[cfg(target_family = "unix")] @@ -312,6 +312,7 @@ pub struct SDistWriter { tar: tar::Builder<GzEncoder<File>>, path: PathBuf, + files: HashSet<PathBuf>, } impl ModuleWriter for SDistWriter { @@ -325,35 +326,48 @@ bytes: &[u8], permissions: u32, ) -> Result<()> { + let target = target.as_ref(); + if self.files.contains(target) { + // Ignore duplicate files + return Ok(()); + } let mut header = tar::Header::new_gnu(); header.set_size(bytes.len() as u64); header.set_mode(permissions); header.set_cksum(); self.tar - .append_data(&mut header, &target, bytes) + .append_data(&mut header, target, bytes) .context(format!( "Failed to add {} bytes to sdist as {}", bytes.len(), - target.as_ref().display() + target.display() ))?; + self.files.insert(target.to_path_buf()); Ok(()) } fn add_file(&mut self, target: impl AsRef<Path>, source: impl AsRef<Path>) -> Result<()> { - if source.as_ref() == self.path { + let source = source.as_ref(); + let target = target.as_ref(); + if source == self.path { bail!( "Attempting to include the sdist output tarball {} into itself! Check 'cargo package --list' output.", - source.as_ref().display() + source.display() ); } + if self.files.contains(target) { + // Ignore duplicate files + return Ok(()); + } self.tar - .append_path_with_name(&source, &target) + .append_path_with_name(source, target) .context(format!( "Failed to add file from {} to sdist as {}", - source.as_ref().display(), - target.as_ref().display(), + source.display(), + target.display(), ))?; + self.files.insert(target.to_path_buf()); Ok(()) } } @@ -371,7 +385,11 @@ let enc = GzEncoder::new(tar_gz, Compression::default()); let tar = tar::Builder::new(enc); - Ok(Self { tar, path }) + Ok(Self { + tar, + path, + files: HashSet::new(), + }) } /// Finished the .tar.gz archive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/src/source_distribution.rs new/maturin-0.13.6/src/source_distribution.rs --- old/maturin-0.13.5/src/source_distribution.rs 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/src/source_distribution.rs 2022-10-08 06:31:04.000000000 +0200 @@ -342,6 +342,7 @@ prefix.join(manifest_path.file_name().unwrap()) }; writer.add_bytes(cargo_toml, rewritten_cargo_toml.as_bytes())?; + for (target, source) in target_source { writer.add_file(prefix.join(target), source)?; } @@ -468,12 +469,16 @@ )?; let manifest_dir = manifest_path.parent().unwrap(); - let include_cargo_lock = + let cargo_lock_path = manifest_dir.join("Cargo.lock"); + let cargo_lock_required = build_context.cargo_options.locked || build_context.cargo_options.frozen; - if include_cargo_lock { - let cargo_lock_path = manifest_dir.join("Cargo.lock"); - let target = root_dir.join("Cargo.lock"); - writer.add_file(&target, &cargo_lock_path)?; + if cargo_lock_required || cargo_lock_path.exists() { + writer.add_file(root_dir.join("Cargo.lock"), &cargo_lock_path)?; + } else { + println!( + "?????? Warning: Cargo.lock is not found, it is recommended \ + to include it in the source distribution" + ); } // Add readme, license and python source files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.13.5/src/target.rs new/maturin-0.13.6/src/target.rs --- old/maturin-0.13.5/src/target.rs 2022-09-27 09:39:47.000000000 +0200 +++ new/maturin-0.13.6/src/target.rs 2022-10-08 06:31:04.000000000 +0200 @@ -579,13 +579,13 @@ let venv = venv_base.as_ref(); if self.is_windows() { let bin_dir = venv.join("Scripts"); - if bin_dir.exists() { + if bin_dir.join("python.exe").exists() { return bin_dir; } // Python innstalled via msys2 on Windows might produce a POSIX-like venv // See https://github.com/PyO3/maturin/issues/1108 let bin_dir = venv.join("bin"); - if bin_dir.exists() { + if bin_dir.join("python.exe").exists() { return bin_dir; } // for conda environment ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/python-maturin/vendor.tar.xz /work/SRC/openSUSE:Factory/.python-maturin.new.2275/vendor.tar.xz differ: char 26, line 1
