From 312a70bf60437d0d7ad61d42e0b886f601cb8076 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Fri, 28 Jun 2024 10:51:33 -0400 Subject: [PATCH] Prepare 0.15.1 release (#1231) * Prepare 0.15.1 release This commit prepares for a 0.15.1 release to fix an inadvertant breaking api change in graphviz_draw() that is causing issues for existing users of the visualizer. * Release note fixes * Fix typos in 0.15.0 release notes This commit fixes typos in the 0.15.0 release notes that were missed during that release. While technically unrelated to preparing 0.15.1 this is a good opportunity to fix them since we'll be rebuilding the docs as part of the new release. * Fix spelling in prelude * Apply suggestions from code review Co-authored-by: Jake Lishman * Move new release notes --------- Co-authored-by: Jake Lishman --- Cargo.lock | 119 +++++++++--------- Cargo.toml | 4 +- docs/source/conf.py | 2 +- ...ayers-rustworkx-core-1caaccb1ca292ca8.yaml | 10 +- ...ix-graphviz-escaping-39a2d1cebb586eca.yaml | 14 +-- ...-lattice-graph-fixes-1cd4aa88f1591701.yaml | 0 .../0.15/prepare-0.15.1-6d729ee825aaeefe.yaml | 4 + setup.py | 2 +- 8 files changed, 84 insertions(+), 71 deletions(-) rename releasenotes/notes/{ => 0.15}/fix-graphviz-escaping-39a2d1cebb586eca.yaml (51%) rename releasenotes/notes/{ => 0.15}/hexagonal-lattice-graph-fixes-1cd4aa88f1591701.yaml (100%) create mode 100644 releasenotes/notes/0.15/prepare-0.15.1-6d729ee825aaeefe.yaml diff --git a/Cargo.lock b/Cargo.lock index 4ed6043b3..bb38b22c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "approx" @@ -43,15 +43,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "cfg-if" @@ -80,15 +80,15 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "equivalent" @@ -104,9 +104,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -195,9 +195,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -207,9 +207,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -280,9 +280,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -359,9 +359,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -369,9 +369,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", @@ -415,9 +415,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -500,9 +500,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -585,9 +585,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags", ] @@ -600,7 +600,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustworkx" -version = "0.15.0" +version = "0.15.1" dependencies = [ "ahash", "fixedbitset", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "rustworkx-core" -version = "0.15.0" +version = "0.15.1" dependencies = [ "ahash", "fixedbitset", @@ -645,9 +645,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -709,9 +709,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.57" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -750,13 +750,14 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -765,60 +766,66 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index f91c49316..003a8d398 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ ] [workspace.package] -version = "0.15.0" +version = "0.15.1" edition = "2021" rust-version = "1.70" authors = ["Matthew Treinish "] @@ -59,7 +59,7 @@ rayon.workspace = true serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" smallvec = { version = "1.0", features = ["union"] } -rustworkx-core = { path = "rustworkx-core", version = "=0.15.0" } +rustworkx-core = { path = "rustworkx-core", version = "=0.15.1" } [dependencies.pyo3] version = "0.21.2" diff --git a/docs/source/conf.py b/docs/source/conf.py index e482375e5..675c09b61 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,7 +26,7 @@ # The short X.Y version. version = '0.15' # The full version, including alpha/beta/rc tags. -release = '0.15.0' +release = '0.15.1' extensions = ['sphinx.ext.autodoc', 'sphinx.ext.autosummary', diff --git a/releasenotes/notes/0.15/add-layers-rustworkx-core-1caaccb1ca292ca8.yaml b/releasenotes/notes/0.15/add-layers-rustworkx-core-1caaccb1ca292ca8.yaml index 0e6921ebb..00cd9da19 100644 --- a/releasenotes/notes/0.15/add-layers-rustworkx-core-1caaccb1ca292ca8.yaml +++ b/releasenotes/notes/0.15/add-layers-rustworkx-core-1caaccb1ca292ca8.yaml @@ -1,11 +1,13 @@ --- features: - | - Added a function ``~rustworkx_core.dag_algo::layers`` in rustworkx-core to - get the layers of a directed acyclic graph. This is equivalent to the + Added a new function ``rustworkx_core::dag_algo::layers`` to rustworkx-core + to get the layers of a directed acyclic graph. This is equivalent to the :func:`.layers` function that existed in the Python API but now exposes it for Rust users too. fix: - | - When calling ``~rustworkx_core.dag_algo::layers``if the provided graph has - a cycle, the function will throw a ``DAGHasCycle`` error instance. \ No newline at end of file + When calling :func:`~.layers` with a graph containing a cycle, the + function will throw a ``DAGHasCycle`` error instance now. Previously, the + function would get stuck in an infinite loop if a graph with a cycle was + passed to the function. diff --git a/releasenotes/notes/fix-graphviz-escaping-39a2d1cebb586eca.yaml b/releasenotes/notes/0.15/fix-graphviz-escaping-39a2d1cebb586eca.yaml similarity index 51% rename from releasenotes/notes/fix-graphviz-escaping-39a2d1cebb586eca.yaml rename to releasenotes/notes/0.15/fix-graphviz-escaping-39a2d1cebb586eca.yaml index 13d1e3bbf..c068b532b 100644 --- a/releasenotes/notes/fix-graphviz-escaping-39a2d1cebb586eca.yaml +++ b/releasenotes/notes/0.15/fix-graphviz-escaping-39a2d1cebb586eca.yaml @@ -4,10 +4,10 @@ fixes: Fixed an issue in the :func:`~.graphviz_draw`, :meth:`.PyGraph.to_dot`, and :meth:`.PyDiGraph.to_dot` which was incorrectly escaping strings when upgrading to 0.15.0. In earlier versions of rustworkx if you manually - placed quotes in a string for an attr callback get that to pass through to - the output dot file this was incorrectly being converted in rustworkx 0.15.0 - to duplicate the quotes and escape them. For example, if you defined a - callback like:: + placed quotes in a string for an attr callback to get that to pass through + to the output dot file, this was incorrectly being converted in rustworkx + 0.15.0 to duplicate the quotes and escape them. For example, if you defined + a callback like:: def color_node(_node): return { @@ -15,8 +15,8 @@ fixes: } to set the color attribute in the output dot file with the string - `"#422952"` (with the quotes) this was incorrectly being converted to - `\"#422952\"`. This no longer occurs, in rustworkx 0.16.0 there will likely - be additional options exposed in :func:`~.graphviz_draw`, + ``"#422952"`` (with the quotes), this was incorrectly being converted to + ``"\"#422952\""``. This no longer occurs, in rustworkx 0.16.0 there will + likely be additional options exposed in :func:`~.graphviz_draw`, :meth:`.PyGraph.to_dot`, and :meth:`.PyDiGraph.to_dot` to expose further options around this. diff --git a/releasenotes/notes/hexagonal-lattice-graph-fixes-1cd4aa88f1591701.yaml b/releasenotes/notes/0.15/hexagonal-lattice-graph-fixes-1cd4aa88f1591701.yaml similarity index 100% rename from releasenotes/notes/hexagonal-lattice-graph-fixes-1cd4aa88f1591701.yaml rename to releasenotes/notes/0.15/hexagonal-lattice-graph-fixes-1cd4aa88f1591701.yaml diff --git a/releasenotes/notes/0.15/prepare-0.15.1-6d729ee825aaeefe.yaml b/releasenotes/notes/0.15/prepare-0.15.1-6d729ee825aaeefe.yaml new file mode 100644 index 000000000..062a1cdea --- /dev/null +++ b/releasenotes/notes/0.15/prepare-0.15.1-6d729ee825aaeefe.yaml @@ -0,0 +1,4 @@ +--- +prelude: > + This release is a bugfix patch release that fixes an inadvertent breaking + API change for the :func:`.graphviz_draw` function in the 0.15.0 release. diff --git a/setup.py b/setup.py index 40bf25ca8..f43c10c7f 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def readme(): graphviz_extras = ["pillow>=5.4"] PKG_NAME = os.getenv("RUSTWORKX_PKG_NAME", "rustworkx") -PKG_VERSION = "0.15.0" +PKG_VERSION = "0.15.1" PKG_PACKAGES = ["rustworkx", "rustworkx.visualization"] PKG_INSTALL_REQUIRES = ["numpy>=1.16.0,<3"] RUST_EXTENSIONS = [RustExtension("rustworkx.rustworkx", "Cargo.toml",