From 89db686d4033c5705d450ed7ee252f7491ed49fd Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Fri, 19 Jan 2024 16:31:39 -0700 Subject: [PATCH] feat!: Updated dependencies Updated: * pyo3 * polars * polars-arrow Removed unused dependencies. --- .github/scripts/run_code_in_mdfile.py | 2 +- book/lace_preprocess_mdbook_yaml/Cargo.lock | 326 +++++++++---------- lace/Cargo.lock | 114 ++----- lace/Cargo.toml | 6 - lace/lace_cc/Cargo.toml | 4 +- lace/lace_codebook/Cargo.toml | 4 - lace/lace_codebook/src/data.rs | 4 +- lace/lace_data/Cargo.toml | 3 - lace/lace_metadata/Cargo.toml | 3 - lace/lace_stats/Cargo.toml | 6 +- pylace/Cargo.lock | 333 ++++++-------------- pylace/Cargo.toml | 6 +- pylace/pyproject.toml | 14 +- pylace/src/utils.rs | 8 +- 14 files changed, 285 insertions(+), 548 deletions(-) diff --git a/.github/scripts/run_code_in_mdfile.py b/.github/scripts/run_code_in_mdfile.py index b4208a39..5b7cbcbe 100644 --- a/.github/scripts/run_code_in_mdfile.py +++ b/.github/scripts/run_code_in_mdfile.py @@ -44,7 +44,7 @@ def process_file(file, language, version): rust_script_contents = f"""//! ```cargo //! [dependencies] //! lace = {{ path = ".", version="{version}", features = ["examples", "ctrlc_handler"] }} - //! polars = {{ version = "0.34", default_features=false, features=["csv", "dtype-i8", "dtype-i16", "dtype-u8", "dtype-u16"] }} + //! polars = {{ version = "0.36", default_features=false, features=["csv", "dtype-i8", "dtype-i16", "dtype-u8", "dtype-u16"] }} //! rand = {{version="0.8", features=["serde1"]}} //! rand_xoshiro = {{ version="0.6", features = ["serde1"] }} //! ``` diff --git a/book/lace_preprocess_mdbook_yaml/Cargo.lock b/book/lace_preprocess_mdbook_yaml/Cargo.lock index ab820025..6828ef28 100644 --- a/book/lace_preprocess_mdbook_yaml/Cargo.lock +++ b/book/lace_preprocess_mdbook_yaml/Cargo.lock @@ -170,6 +170,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atoi_simd" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" + [[package]] name = "autocfg" version = "1.1.0" @@ -292,7 +298,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -353,15 +359,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -542,16 +539,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "fnv" version = "1.0.7" @@ -887,7 +874,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.51.1", ] [[package]] @@ -979,9 +966,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -1032,17 +1019,13 @@ dependencies = [ [[package]] name = "lace_codebook" -version = "0.4.0" +version = "0.5.0" dependencies = [ - "flate2", "lace_consts", "lace_data", "lace_stats", "lace_utils", - "maplit", "polars", - "rand", - "rayon", "serde", "serde_yaml", "thiserror", @@ -1050,7 +1033,7 @@ dependencies = [ [[package]] name = "lace_consts" -version = "0.2.0" +version = "0.2.1" dependencies = [ "rv", ] @@ -1060,7 +1043,6 @@ name = "lace_data" version = "0.2.0" dependencies = [ "lace_utils", - "regex", "serde", "thiserror", ] @@ -1086,15 +1068,13 @@ dependencies = [ [[package]] name = "lace_stats" -version = "0.2.0" +version = "0.2.1" dependencies = [ "itertools", "lace_consts", "lace_data", "lace_utils", "rand", - "rand_xoshiro", - "regex", "serde", "special", "thiserror", @@ -1113,79 +1093,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - [[package]] name = "libc" version = "0.2.150" @@ -1635,7 +1542,7 @@ dependencies = [ "libc", "redox_syscall 0.4.1", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1806,9 +1713,9 @@ dependencies = [ [[package]] name = "polars" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40db657cc67a8dd9fe4b40db5b73027f5f224623545597e1930cbbb9c05b1de5" +checksum = "938048fcda6a8e2ace6eb168bee1b415a92423ce51e418b853bf08fc40349b6b" dependencies = [ "getrandom", "polars-core", @@ -1821,37 +1728,54 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e50c63db77f846ac5119477422f0156f0a1826ceaae7d921f9a6d5ea5f7ca3" +checksum = "ce68a02f698ff7787c261aea1b4c040a8fe183a8fb200e2436d7f35d95a1b86f" dependencies = [ "ahash", "arrow-format", + "atoi_simd", "bytemuck", "chrono", "dyn-clone", "either", "ethnum", + "fast-float", "foreign_vec", "getrandom", "hashbrown 0.14.2", - "lexical-core", + "itoa", "lz4", "multiversion", "num-traits", "polars-error", - "rustc_version", + "polars-utils", + "ryu", "simdutf8", "streaming-iterator", "strength_reduce", + "version_check", "zstd", ] +[[package]] +name = "polars-compute" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14fbc5f141b29b656a4cec4802632e5bff10bf801c6809c6bbfbd4078a044dd" +dependencies = [ + "bytemuck", + "num-traits", + "polars-arrow", + "polars-utils", + "version_check", +] + [[package]] name = "polars-core" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfb622b8ca81b4614c64d95e7590d6e0571d7d398b5ad595c1abc4412abe714" +checksum = "d0f5efe734b6cbe5f97ea769be8360df5324fade396f1f3f5ad7fe9360ca4a23" dependencies = [ "ahash", "bitflags 2.4.1", @@ -1863,6 +1787,7 @@ dependencies = [ "num-traits", "once_cell", "polars-arrow", + "polars-compute", "polars-error", "polars-row", "polars-utils", @@ -1878,9 +1803,9 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6480520ebde0b20935b600483b865513891e36c04942cebdd19e4f338257b4" +checksum = "6396de788f99ebfc9968e7b6f523e23000506cde4ba6dfc62ae4ce949002a886" dependencies = [ "arrow-format", "regex", @@ -1890,16 +1815,16 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666466a3b151047c76d99b4e4e5f5438895ef97848008cf49b06df8e3d2d395a" +checksum = "7d0458efe8946f4718fd352f230c0db5a37926bd0d2bd25af79dc24746abaaea" dependencies = [ "ahash", + "atoi_simd", "bytes", "fast-float", "home", "itoa", - "lexical", "memchr", "memmap2", "num-traits", @@ -1918,9 +1843,9 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e1c2da1ca20106f80d9510090344e7311fd1dcfd6e6b65031e10606c0958c7" +checksum = "9d7105b40905bb38e8fc4a7fd736594b7491baa12fad3ac492969ca221a1b5d5" dependencies = [ "ahash", "bitflags 2.4.1", @@ -1941,9 +1866,9 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe2d37a6a3ef358499d43aecee80740e62dd44e6cfe7a9c4aa0b8db88de8292" +checksum = "2e09afc456ab11e75e5dcb43e00a01c71f3a46a2781e450054acb6bb096ca78e" dependencies = [ "ahash", "argminmax", @@ -1954,6 +1879,7 @@ dependencies = [ "memchr", "num-traits", "polars-arrow", + "polars-compute", "polars-core", "polars-error", "polars-utils", @@ -1965,9 +1891,9 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6aa050d529be01617f54bc60658149da76f97dbea9fdac3c9d60b811f64a2ba" +checksum = "d9b7ead073cc3917027d77b59861a9f071db47125de9314f8907db1a0a3e4100" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -1975,6 +1901,7 @@ dependencies = [ "hashbrown 0.14.2", "num-traits", "polars-arrow", + "polars-compute", "polars-core", "polars-io", "polars-ops", @@ -1988,9 +1915,9 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c47e5d62d8f612aab61a6331d04c5c95c9ff301106d8b91131c8833b4ef3def6" +checksum = "384a175624d050c31c473ee11df9d7af5d729ae626375e522158cfb3d150acd0" dependencies = [ "ahash", "bytemuck", @@ -2011,9 +1938,9 @@ dependencies = [ [[package]] name = "polars-row" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05d6544f7d6065fcaa93bc69aac0532ce09aab4f81ec03c9a78dd901bb0c05b" +checksum = "32322f7acbb83db3e9c7697dc821be73d06238da89c817dcc8bc1549a5e9c72f" dependencies = [ "polars-arrow", "polars-error", @@ -2022,9 +1949,9 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f65f9c8bfe7f0b2c08c38c79b92ec4ddaf213fc424d94a6272ed7b2d83987f" +checksum = "9f0b4c6ddffdfd0453e84bc3918572c633014d661d166654399cf93752aa95b5" dependencies = [ "polars-arrow", "polars-core", @@ -2039,9 +1966,9 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3763af36aeeb85ef083f11c43bc28c5b6222e2aae039c5118d916bc855f2b5b9" +checksum = "dee2649fc96bd1b6584e0e4a4b3ca7d22ed3d117a990e63ad438ecb26f7544d0" dependencies = [ "atoi", "chrono", @@ -2058,13 +1985,14 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d2c038ff67e4eb6019682c3f66d83f744e285de9c28e816109a61bace824cd" +checksum = "b174ca4a77ad47d7b91a0460aaae65bbf874c8bfbaaa5308675dadef3976bbda" dependencies = [ "ahash", "bytemuck", "hashbrown 0.14.2", + "indexmap 2.1.0", "num-traits", "once_cell", "polars-error", @@ -2163,15 +2091,6 @@ dependencies = [ "rand", ] -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core", -] - [[package]] name = "rawpointer" version = "0.2.1" @@ -2251,15 +2170,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.38.23" @@ -2290,9 +2200,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rv" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64081d5a5cd97b60822603f9900df77d67c8258e9a8143b6aff950753f2bbe1" +checksum = "9ad4c180111696893363158f59ee1b15500947365270b7460a432fc207f926bf" dependencies = [ "doc-comment", "lru", @@ -2513,9 +2423,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" +checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" dependencies = [ "log", ] @@ -2607,16 +2517,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.10" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", - "winapi", + "windows", ] [[package]] @@ -3080,13 +2990,32 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.0", +] + [[package]] name = "windows-core" version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -3095,7 +3024,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -3104,13 +3033,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -3119,42 +3063,84 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "xxhash-rust" version = "0.8.7" diff --git a/lace/Cargo.lock b/lace/Cargo.lock index b61ca87e..29d0abac 100644 --- a/lace/Cargo.lock +++ b/lace/Cargo.lock @@ -83,9 +83,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628a8f9bd1e24b4e0db2b4bc2d000b001e7dd032d54afa60a68836aeec5aa54a" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccf09143e56923c12e027b83a9553210a3c58322ed8419a53461b14a4dccd85" +checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83" dependencies = [ "askama_parser", "basic-toml", @@ -202,9 +202,9 @@ checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] name = "askama_parser" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262eb9cf7be51269c5f2951eeda9ccd14d6934e437457f47b4f066bf55a6770d" +checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0" dependencies = [ "nom", ] @@ -979,9 +979,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -1108,9 +1108,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -1144,16 +1144,13 @@ name = "lace" version = "0.6.0" dependencies = [ "approx", - "bincode", "clap", "criterion", "ctrlc", "dirs", - "flate2", "indexmap 2.1.0", "indicatif", "indoc", - "itertools 0.11.0", "lace_cc", "lace_codebook", "lace_consts", @@ -1162,7 +1159,6 @@ dependencies = [ "lace_metadata", "lace_stats", "lace_utils", - "log", "maplit", "num", "plotly", @@ -1171,11 +1167,9 @@ dependencies = [ "rand_distr", "rand_xoshiro", "rayon", - "regex", "serde", "serde_json", "serde_yaml", - "special", "tempfile", "thiserror", ] @@ -1187,9 +1181,7 @@ dependencies = [ "approx", "criterion", "enum_dispatch", - "indicatif", - "indoc", - "itertools 0.11.0", + "itertools 0.12.0", "lace_codebook", "lace_consts", "lace_data", @@ -1208,16 +1200,12 @@ dependencies = [ name = "lace_codebook" version = "0.5.0" dependencies = [ - "flate2", "indoc", "lace_consts", "lace_data", "lace_stats", "lace_utils", - "maplit", "polars", - "rand", - "rayon", "serde", "serde_yaml", "tempfile", @@ -1236,10 +1224,7 @@ name = "lace_data" version = "0.2.0" dependencies = [ "approx", - "criterion", "lace_utils", - "rand", - "regex", "serde", "serde_json", "thiserror", @@ -1262,14 +1247,12 @@ name = "lace_metadata" version = "0.5.0" dependencies = [ "bincode", - "dirs", "hex", "lace_cc", "lace_codebook", "lace_data", "lace_stats", "log", - "once_cell", "rand_xoshiro", "rayon", "serde", @@ -1277,7 +1260,6 @@ dependencies = [ "serde_yaml", "tempfile", "thiserror", - "toml", ] [[package]] @@ -1286,17 +1268,13 @@ version = "0.2.1" dependencies = [ "approx", "criterion", - "itertools 0.11.0", + "itertools 0.12.0", "lace_consts", "lace_data", "lace_utils", - "maplit", "rand", "rand_distr", - "rand_xoshiro", - "regex", "serde", - "serde_json", "special", "thiserror", ] @@ -1404,9 +1382,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" @@ -1795,9 +1773,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "planus" @@ -2320,9 +2298,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -2330,9 +2308,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2521,15 +2499,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - [[package]] name = "serde_with" version = "2.3.3" @@ -2860,40 +2829,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.1.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "typenum" version = "1.17.0" @@ -3223,15 +3158,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -[[package]] -name = "winnow" -version = "0.5.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" -dependencies = [ - "memchr", -] - [[package]] name = "xxhash-rust" version = "0.8.8" diff --git a/lace/Cargo.toml b/lace/Cargo.toml index 8e8c55fc..68de28a6 100644 --- a/lace/Cargo.toml +++ b/lace/Cargo.toml @@ -40,7 +40,6 @@ lace_consts = { path = "lace_consts", version = "0.2.1" } lace_data = { path = "lace_data", version = "0.2.0" } lace_metadata = { path = "lace_metadata", version = "0.5.0" } dirs = { version="5", optional = true} -itertools = "0.11" num = "0.4" rand_xoshiro = { version="0.6", features = ["serde1"] } rand_distr = "0.4" @@ -49,16 +48,11 @@ rayon = "1.5" serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" serde_json = "1" -bincode = "1" -special = "0.10" -log = "0.4" -regex = "1" maplit = "1" indexmap = { version = "2.0.0", features = ["serde"] } thiserror = "1.0.19" indicatif = "0.17.0" ctrlc = { version = "3.2.1", optional = true } -flate2 = "1.0.23" polars = { version = "0.36", default_features=false, features=["csv", "dtype-i8", "dtype-i16", "dtype-u8", "dtype-u16"] } [dev-dependencies] diff --git a/lace/lace_cc/Cargo.toml b/lace/lace_cc/Cargo.toml index a428dc6c..a4017195 100644 --- a/lace/lace_cc/Cargo.toml +++ b/lace/lace_cc/Cargo.toml @@ -23,13 +23,11 @@ enum_dispatch = "0.3.10" thiserror = "1.0.19" rand_xoshiro = { version="0.6", features = ["serde1"] } special = "0.10" -itertools = "0.11" -indicatif = "0.17.0" +itertools = "0.12" [dev-dependencies] approx = "0.5.1" criterion = "0.5" -indoc = "2.0.3" [[bench]] name = "state_types" diff --git a/lace/lace_codebook/Cargo.toml b/lace/lace_codebook/Cargo.toml index ea65513f..9c22b8d3 100644 --- a/lace/lace_codebook/Cargo.toml +++ b/lace/lace_codebook/Cargo.toml @@ -15,11 +15,7 @@ lace_utils = { path = "../lace_utils", version = "0.2.0" } lace_data = { path = "../lace_data", version = "0.2.0" } serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" -maplit = "1" -rand = {version="0.8.5", features=["serde1"]} thiserror = "1.0.11" -rayon = "1.5" -flate2 = "1.0.23" polars = { version = "0.36", default_features=false, features=["csv", "dtype-i8", "dtype-i16", "dtype-u8", "dtype-u16"] } [features] diff --git a/lace/lace_codebook/src/data.rs b/lace/lace_codebook/src/data.rs index a71066d9..1e2cffbd 100644 --- a/lace/lace_codebook/src/data.rs +++ b/lace/lace_codebook/src/data.rs @@ -232,7 +232,7 @@ fn uint_coltype( cat_cutoff: Option, no_hypers: bool, ) -> Result { - let x_max: u64 = srs.max()?.unwrap(); + let x_max: u64 = srs.max().unwrap().unwrap(); let maxval = cat_cutoff.unwrap_or(DEFAULT_CAT_CUTOFF) as u64; if x_max >= maxval { count_coltype(srs, no_hypers) @@ -246,7 +246,7 @@ fn int_coltype( cat_cutoff: Option, no_hypers: bool, ) -> Result { - let x_min: i64 = srs.min()?.unwrap(); + let x_min: i64 = srs.min().unwrap().unwrap(); if x_min < 0 { continuous_coltype(srs, no_hypers) } else { diff --git a/lace/lace_data/Cargo.toml b/lace/lace_data/Cargo.toml index 7524ad42..2af4a638 100644 --- a/lace/lace_data/Cargo.toml +++ b/lace/lace_data/Cargo.toml @@ -12,10 +12,7 @@ description = "Data definitions and data container definitions for Lace" lace_utils = { path = "../lace_utils", version = "0.2.0" } serde = { version = "1", features = ["derive"] } thiserror = "1.0.19" -regex = "1" [dev-dependencies] approx = "0.5.1" -rand = {version="0.8", features=["serde1"]} -criterion = "0.5" serde_json = "1" diff --git a/lace/lace_metadata/Cargo.toml b/lace/lace_metadata/Cargo.toml index 793c33f9..06765057 100644 --- a/lace/lace_metadata/Cargo.toml +++ b/lace/lace_metadata/Cargo.toml @@ -13,16 +13,13 @@ lace_stats = { path = "../lace_stats", version = "0.2.1" } lace_data = { path = "../lace_data", version = "0.2.0" } lace_codebook = { path = "../lace_codebook", version = "0.5.0" } lace_cc = { path = "../lace_cc", version = "0.5.0" } -dirs = "5" serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" serde_json = "1" -toml = "0.7" bincode = "1" log = "0.4" rand_xoshiro = { version="0.6", features = ["serde1"] } thiserror = "1.0.19" -once_cell = "1" hex = "0.4" rayon = "1.5" diff --git a/lace/lace_stats/Cargo.toml b/lace/lace_stats/Cargo.toml index 8621884d..3d3be881 100644 --- a/lace/lace_stats/Cargo.toml +++ b/lace/lace_stats/Cargo.toml @@ -15,18 +15,14 @@ lace_consts = { path = "../lace_consts", version = "0.2.1" } lace_data = { path = "../lace_data", version = "0.2.0" } special = "0.10" rand = {version="0.8", features=["serde1"]} -rand_xoshiro = "0.6" -itertools = "0.11" +itertools = "0.12" serde = { version = "1", features = ["derive"] } -regex = "1.6.0" thiserror = "1.0.11" [dev-dependencies] approx = "0.5.1" criterion = "0.5" -maplit = "1" rand_distr = "0.4" -serde_json = "1" [[bench]] name = "seq" diff --git a/pylace/Cargo.lock b/pylace/Cargo.lock index 200999ae..04da8564 100644 --- a/pylace/Cargo.lock +++ b/pylace/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "ahash" version = "0.8.7" @@ -94,6 +88,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atoi_simd" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" + [[package]] name = "autocfg" version = "1.1.0" @@ -212,15 +212,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - [[package]] name = "crossbeam-channel" version = "0.5.11" @@ -361,16 +352,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "foreign_vec" version = "0.1.0" @@ -492,9 +473,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "instant" @@ -507,9 +488,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -542,12 +523,9 @@ dependencies = [ name = "lace" version = "0.6.0" dependencies = [ - "bincode", "dirs", - "flate2", "indexmap", "indicatif", - "itertools", "lace_cc", "lace_codebook", "lace_consts", @@ -556,7 +534,6 @@ dependencies = [ "lace_metadata", "lace_stats", "lace_utils", - "log", "maplit", "num", "polars", @@ -564,11 +541,9 @@ dependencies = [ "rand_distr", "rand_xoshiro", "rayon", - "regex", "serde", "serde_json", "serde_yaml", - "special", "thiserror", ] @@ -577,7 +552,6 @@ name = "lace_cc" version = "0.5.0" dependencies = [ "enum_dispatch", - "indicatif", "itertools", "lace_codebook", "lace_consts", @@ -597,15 +571,11 @@ dependencies = [ name = "lace_codebook" version = "0.5.0" dependencies = [ - "flate2", "lace_consts", "lace_data", "lace_stats", "lace_utils", - "maplit", "polars", - "rand", - "rayon", "serde", "serde_yaml", "thiserror", @@ -623,7 +593,6 @@ name = "lace_data" version = "0.2.0" dependencies = [ "lace_utils", - "regex", "serde", "thiserror", ] @@ -645,21 +614,18 @@ name = "lace_metadata" version = "0.5.0" dependencies = [ "bincode", - "dirs", "hex", "lace_cc", "lace_codebook", "lace_data", "lace_stats", "log", - "once_cell", "rand_xoshiro", "rayon", "serde", "serde_json", "serde_yaml", "thiserror", - "toml", ] [[package]] @@ -671,8 +637,6 @@ dependencies = [ "lace_data", "lace_utils", "rand", - "rand_xoshiro", - "regex", "serde", "special", "thiserror", @@ -691,79 +655,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - [[package]] name = "libc" version = "0.2.152" @@ -875,15 +766,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "multiversion" version = "0.7.3" @@ -1140,9 +1022,9 @@ dependencies = [ [[package]] name = "polars" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40db657cc67a8dd9fe4b40db5b73027f5f224623545597e1930cbbb9c05b1de5" +checksum = "938048fcda6a8e2ace6eb168bee1b415a92423ce51e418b853bf08fc40349b6b" dependencies = [ "getrandom", "polars-core", @@ -1156,37 +1038,54 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e50c63db77f846ac5119477422f0156f0a1826ceaae7d921f9a6d5ea5f7ca3" +checksum = "ce68a02f698ff7787c261aea1b4c040a8fe183a8fb200e2436d7f35d95a1b86f" dependencies = [ "ahash", "arrow-format", + "atoi_simd", "bytemuck", "chrono", "dyn-clone", "either", "ethnum", + "fast-float", "foreign_vec", "getrandom", "hashbrown 0.14.3", - "lexical-core", + "itoa", "lz4", "multiversion", "num-traits", "polars-error", - "rustc_version", + "polars-utils", + "ryu", "simdutf8", "streaming-iterator", "strength_reduce", + "version_check", "zstd", ] +[[package]] +name = "polars-compute" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14fbc5f141b29b656a4cec4802632e5bff10bf801c6809c6bbfbd4078a044dd" +dependencies = [ + "bytemuck", + "num-traits", + "polars-arrow", + "polars-utils", + "version_check", +] + [[package]] name = "polars-core" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfb622b8ca81b4614c64d95e7590d6e0571d7d398b5ad595c1abc4412abe714" +checksum = "d0f5efe734b6cbe5f97ea769be8360df5324fade396f1f3f5ad7fe9360ca4a23" dependencies = [ "ahash", "bitflags 2.4.2", @@ -1199,6 +1098,7 @@ dependencies = [ "num-traits", "once_cell", "polars-arrow", + "polars-compute", "polars-error", "polars-row", "polars-utils", @@ -1214,9 +1114,9 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6480520ebde0b20935b600483b865513891e36c04942cebdd19e4f338257b4" +checksum = "6396de788f99ebfc9968e7b6f523e23000506cde4ba6dfc62ae4ce949002a886" dependencies = [ "arrow-format", "regex", @@ -1226,17 +1126,17 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666466a3b151047c76d99b4e4e5f5438895ef97848008cf49b06df8e3d2d395a" +checksum = "7d0458efe8946f4718fd352f230c0db5a37926bd0d2bd25af79dc24746abaaea" dependencies = [ "ahash", + "atoi_simd", "bytes", "chrono", "fast-float", "home", "itoa", - "lexical", "memchr", "memmap2", "num-traits", @@ -1256,9 +1156,9 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e1c2da1ca20106f80d9510090344e7311fd1dcfd6e6b65031e10606c0958c7" +checksum = "9d7105b40905bb38e8fc4a7fd736594b7491baa12fad3ac492969ca221a1b5d5" dependencies = [ "ahash", "bitflags 2.4.2", @@ -1279,9 +1179,9 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe2d37a6a3ef358499d43aecee80740e62dd44e6cfe7a9c4aa0b8db88de8292" +checksum = "2e09afc456ab11e75e5dcb43e00a01c71f3a46a2781e450054acb6bb096ca78e" dependencies = [ "ahash", "argminmax", @@ -1292,6 +1192,7 @@ dependencies = [ "memchr", "num-traits", "polars-arrow", + "polars-compute", "polars-core", "polars-error", "polars-utils", @@ -1303,9 +1204,9 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6aa050d529be01617f54bc60658149da76f97dbea9fdac3c9d60b811f64a2ba" +checksum = "d9b7ead073cc3917027d77b59861a9f071db47125de9314f8907db1a0a3e4100" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -1313,6 +1214,7 @@ dependencies = [ "hashbrown 0.14.3", "num-traits", "polars-arrow", + "polars-compute", "polars-core", "polars-io", "polars-ops", @@ -1326,9 +1228,9 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c47e5d62d8f612aab61a6331d04c5c95c9ff301106d8b91131c8833b4ef3def6" +checksum = "384a175624d050c31c473ee11df9d7af5d729ae626375e522158cfb3d150acd0" dependencies = [ "ahash", "bytemuck", @@ -1349,9 +1251,9 @@ dependencies = [ [[package]] name = "polars-row" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05d6544f7d6065fcaa93bc69aac0532ce09aab4f81ec03c9a78dd901bb0c05b" +checksum = "32322f7acbb83db3e9c7697dc821be73d06238da89c817dcc8bc1549a5e9c72f" dependencies = [ "polars-arrow", "polars-error", @@ -1360,9 +1262,9 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f65f9c8bfe7f0b2c08c38c79b92ec4ddaf213fc424d94a6272ed7b2d83987f" +checksum = "9f0b4c6ddffdfd0453e84bc3918572c633014d661d166654399cf93752aa95b5" dependencies = [ "polars-arrow", "polars-core", @@ -1377,9 +1279,9 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3763af36aeeb85ef083f11c43bc28c5b6222e2aae039c5118d916bc855f2b5b9" +checksum = "dee2649fc96bd1b6584e0e4a4b3ca7d22ed3d117a990e63ad438ecb26f7544d0" dependencies = [ "atoi", "chrono", @@ -1396,13 +1298,14 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.34.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d2c038ff67e4eb6019682c3f66d83f744e285de9c28e816109a61bace824cd" +checksum = "b174ca4a77ad47d7b91a0460aaae65bbf874c8bfbaaa5308675dadef3976bbda" dependencies = [ "ahash", "bytemuck", "hashbrown 0.14.3", + "indexmap", "num-traits", "once_cell", "polars-error", @@ -1456,9 +1359,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" dependencies = [ "cfg-if", "indoc", @@ -1473,9 +1376,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" dependencies = [ "once_cell", "target-lexicon", @@ -1483,9 +1386,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" dependencies = [ "libc", "pyo3-build-config", @@ -1493,25 +1396,26 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" dependencies = [ + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -1650,15 +1554,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -1703,12 +1598,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "semver" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" - [[package]] name = "serde" version = "1.0.195" @@ -1740,15 +1629,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - [[package]] name = "serde_yaml" version = "0.9.30" @@ -1809,9 +1689,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" +checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" dependencies = [ "log", ] @@ -1877,16 +1757,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", - "winapi", + "windows", ] [[package]] @@ -1930,40 +1810,6 @@ dependencies = [ "crossbeam-channel", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "typenum" version = "1.17.0" @@ -1984,9 +1830,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "unsafe-libyaml" @@ -2092,6 +1938,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -2233,15 +2089,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -[[package]] -name = "winnow" -version = "0.5.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" -dependencies = [ - "memchr", -] - [[package]] name = "xxhash-rust" version = "0.8.8" diff --git a/pylace/Cargo.toml b/pylace/Cargo.toml index e196a3c7..3a40fd56 100644 --- a/pylace/Cargo.toml +++ b/pylace/Cargo.toml @@ -13,11 +13,11 @@ lace = { path = "../lace", version="0.6.0" } lace_utils = { path = "../lace/lace_utils", version="0.2.0" } rand = "0.8.5" rand_xoshiro = "0.6.0" -pyo3 = { version = "0.19", features = ["extension-module"] } +pyo3 = { version = "0.20", features = ["extension-module"] } serde_json = "1.0.91" serde_yaml = "0.9.17" -polars = "0.34" -polars-arrow = "0.34.2" +polars = "0.36" +polars-arrow = "0.36.2" [package.metadata.maturin] name = "lace.core" diff --git a/pylace/pyproject.toml b/pylace/pyproject.toml index 3331d499..7f5c9712 100644 --- a/pylace/pyproject.toml +++ b/pylace/pyproject.toml @@ -34,15 +34,15 @@ maintainers = [ ] dependencies = [ - 'numpy ~= 1.21', - 'matplotlib ~= 3.7.1', + 'numpy ~= 1.26', + 'matplotlib ~= 3.8.2', 'seaborn ~= 0.13', 'pandas ~= 1.3', - 'polars ~= 0.19.14', - 'scipy ~= 1.7', - 'plotly ~= 5.14', - 'tqdm ~= 4.64.1', - 'pyarrow ~= 11.0.0' + 'polars ~= 0.20.5', + 'scipy ~= 1.11', + 'plotly ~= 5.18', + 'tqdm ~= 4.66.1', + 'pyarrow ~= 14.0.0' ] [project.urls] diff --git a/pylace/src/utils.rs b/pylace/src/utils.rs index aa17ddaf..32fd63d3 100644 --- a/pylace/src/utils.rs +++ b/pylace/src/utils.rs @@ -206,12 +206,12 @@ pub(crate) fn coltype_to_ftype(col_type: &ColType) -> FType { pub(crate) fn mi_args_from_dict(dict: &PyDict) -> PyResult { let n_mc_samples: Option = dict - .get_item("n_mc_samples") + .get_item("n_mc_samples")? .map(|any| any.extract::()) .transpose()?; let mi_type: Option = dict - .get_item("mi_type") + .get_item("mi_type")? .map(|any| any.extract::()) .transpose()?; @@ -223,11 +223,11 @@ pub(crate) fn mi_args_from_dict(dict: &PyDict) -> PyResult { pub(crate) fn rowsim_args_from_dict(dict: &PyDict) -> PyResult { let col_weighted: Option = dict - .get_item("col_weighted") + .get_item("col_weighted")? .map(|any| any.extract::()) .transpose()?; - let wrt: Option<&PyAny> = dict.get_item("wrt"); + let wrt: Option<&PyAny> = dict.get_item("wrt")?; Ok(RowsimArgs { wrt,