From 6b193b59ecc7976687a7d2bdd8ddb82878882ec5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 13 Sep 2024 15:10:41 +0200 Subject: [PATCH] python312Packages.polars: 1.6.0 -> 1.7.1 Diff: https://github.com/pola-rs/polars/compare/refs/tags/py-1.6.0...1.7.1 Changelog: https://github.com/pola-rs/polars/releases/tag/py-1.7.1 --- .../python-modules/polars/Cargo.lock | 191 ++++++++++-------- .../python-modules/polars/default.nix | 21 +- 2 files changed, 119 insertions(+), 93 deletions(-) diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index d497643fc267..94a0a87e3d8c 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -108,13 +108,13 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "apache-avro" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb7c683b2f8f40970b70e39ff8be514c95b96fcb9c4af87e1ed2cb2e10801a0" +checksum = "1aef82843a0ec9f8b19567445ad2421ceeb1d711514384bdd3d49fe37102ee13" dependencies = [ + "bigdecimal", "crc32fast", "digest", - "lazy_static", "libflate 2.1.0", "log", "num-bigint", @@ -122,10 +122,11 @@ dependencies = [ "rand", "regex-lite", "serde", + "serde_bytes", "serde_json", "snap", - "strum 0.25.0", - "strum_macros 0.25.3", + "strum", + "strum_macros", "thiserror", "typed-builder", "uuid", @@ -737,6 +738,20 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bigdecimal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" +dependencies = [ + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", + "serde", +] + [[package]] name = "bincode" version = "1.3.3" @@ -893,6 +908,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + [[package]] name = "cc" version = "1.1.14" @@ -1022,11 +1046,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ "crossterm", - "strum 0.26.3", - "strum_macros 0.26.4", + "strum", + "strum_macros", "unicode-width", ] +[[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "serde", + "static_assertions", +] + [[package]] name = "const-oid" version = "0.9.6" @@ -1973,9 +2012,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -2229,7 +2268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -2494,6 +2533,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", + "serde", ] [[package]] @@ -2913,7 +2953,7 @@ dependencies = [ [[package]] name = "polars" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "apache-avro", @@ -2943,7 +2983,7 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "arrow-array", @@ -2978,6 +3018,7 @@ dependencies = [ "parking_lot", "polars-arrow-format", "polars-error", + "polars-schema", "polars-utils", "proptest", "rand", @@ -3011,7 +3052,7 @@ dependencies = [ [[package]] name = "polars-compute" -version = "0.42.0" +version = "0.43.1" dependencies = [ "bytemuck", "either", @@ -3026,7 +3067,7 @@ dependencies = [ [[package]] name = "polars-core" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "arrow-array", @@ -3046,6 +3087,7 @@ dependencies = [ "polars-compute", "polars-error", "polars-row", + "polars-schema", "polars-utils", "rand", "rand_distr", @@ -3053,7 +3095,6 @@ dependencies = [ "regex", "serde", "serde_json", - "smartstring", "thiserror", "version_check", "xxhash-rust", @@ -3061,7 +3102,7 @@ dependencies = [ [[package]] name = "polars-doc-examples" -version = "0.42.0" +version = "0.43.1" dependencies = [ "aws-config", "aws-sdk-s3", @@ -3075,7 +3116,7 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.42.0" +version = "0.43.1" dependencies = [ "avro-schema", "object_store", @@ -3087,12 +3128,13 @@ dependencies = [ [[package]] name = "polars-expr" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "bitflags", "once_cell", "polars-arrow", + "polars-compute", "polars-core", "polars-io", "polars-json", @@ -3101,12 +3143,11 @@ dependencies = [ "polars-time", "polars-utils", "rayon", - "smartstring", ] [[package]] name = "polars-ffi" -version = "0.42.0" +version = "0.43.1" dependencies = [ "polars-arrow", "polars-core", @@ -3114,7 +3155,7 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "async-trait", @@ -3142,6 +3183,7 @@ dependencies = [ "polars-error", "polars-json", "polars-parquet", + "polars-schema", "polars-time", "polars-utils", "rayon", @@ -3152,7 +3194,6 @@ dependencies = [ "serde_json", "simd-json", "simdutf8", - "smartstring", "tempfile", "tokio", "tokio-util", @@ -3162,7 +3203,7 @@ dependencies = [ [[package]] name = "polars-json" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "chrono", @@ -3182,7 +3223,7 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "bitflags", @@ -3204,14 +3245,13 @@ dependencies = [ "pyo3", "rayon", "serde_json", - "smartstring", "tokio", "version_check", ] [[package]] name = "polars-mem-engine" -version = "0.42.0" +version = "0.43.1" dependencies = [ "futures", "memmap2", @@ -3232,7 +3272,7 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "aho-corasick", @@ -3253,6 +3293,7 @@ dependencies = [ "polars-core", "polars-error", "polars-json", + "polars-schema", "polars-utils", "rand", "rand_distr", @@ -3260,14 +3301,13 @@ dependencies = [ "regex", "serde", "serde_json", - "smartstring", "unicode-reverse", "version_check", ] [[package]] name = "polars-parquet" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "async-stream", @@ -3278,6 +3318,7 @@ dependencies = [ "fallible-streaming-iterator", "flate2", "futures", + "hashbrown", "lz4", "lz4_flex", "num-traits", @@ -3297,7 +3338,7 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.42.0" +version = "0.43.1" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -3315,7 +3356,6 @@ dependencies = [ "polars-row", "polars-utils", "rayon", - "smartstring", "tokio", "uuid", "version_check", @@ -3323,11 +3363,12 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "bitflags", "bytemuck", + "bytes", "chrono", "chrono-tz", "ciborium", @@ -3353,18 +3394,18 @@ dependencies = [ "regex", "serde", "serde_json", - "smartstring", - "strum_macros 0.26.4", + "strum_macros", "version_check", ] [[package]] name = "polars-python" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "arboard", "bytemuck", + "bytes", "ciborium", "either", "itoa", @@ -3387,14 +3428,13 @@ dependencies = [ "pyo3", "recursive", "serde_json", - "smartstring", "thiserror", "version_check", ] [[package]] name = "polars-row" -version = "0.42.0" +version = "0.43.1" dependencies = [ "bytemuck", "polars-arrow", @@ -3402,9 +3442,20 @@ dependencies = [ "polars-utils", ] +[[package]] +name = "polars-schema" +version = "0.43.1" +dependencies = [ + "indexmap", + "polars-error", + "polars-utils", + "serde", + "version_check", +] + [[package]] name = "polars-sql" -version = "0.42.0" +version = "0.43.1" dependencies = [ "hex", "once_cell", @@ -3415,6 +3466,7 @@ dependencies = [ "polars-ops", "polars-plan", "polars-time", + "polars-utils", "rand", "serde", "serde_json", @@ -3423,7 +3475,7 @@ dependencies = [ [[package]] name = "polars-stream" -version = "0.42.0" +version = "0.43.1" dependencies = [ "atomic-waker", "crossbeam-deque", @@ -3450,7 +3502,7 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.42.0" +version = "0.43.1" dependencies = [ "atoi", "bytemuck", @@ -3465,16 +3517,16 @@ dependencies = [ "polars-utils", "regex", "serde", - "smartstring", ] [[package]] name = "polars-utils" -version = "0.42.0" +version = "0.43.1" dependencies = [ "ahash", "bytemuck", "bytes", + "compact_str", "hashbrown", "indexmap", "libc", @@ -3486,7 +3538,6 @@ dependencies = [ "raw-cpuid", "rayon", "serde", - "smartstring", "stacker", "sysinfo", "version_check", @@ -3572,7 +3623,7 @@ dependencies = [ [[package]] name = "py-polars" -version = "1.6.0" +version = "1.7.1" dependencies = [ "built", "jemallocator", @@ -3695,9 +3746,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", @@ -4278,6 +4329,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.209" @@ -4424,18 +4484,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "serde", - "static_assertions", - "version_check", -] - [[package]] name = "snafu" version = "0.7.5" @@ -4539,31 +4587,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" - [[package]] name = "strum" version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.76", -] - [[package]] name = "strum_macros" version = "0.26.4" @@ -4909,18 +4938,18 @@ dependencies = [ [[package]] name = "typed-builder" -version = "0.16.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16" +checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.16.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" +checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 4ad80d3de698..7535ae218c54 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -2,12 +2,10 @@ lib, stdenv, buildPythonPackage, - pythonOlder, rustPlatform, cmake, libiconv, fetchFromGitHub, - typing-extensions, jemalloc, rust-jemalloc-sys, darwin, @@ -21,16 +19,14 @@ in buildPythonPackage rec { pname = "polars"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-qJTBGGRxMAirgygm7Ke60olO5sTZboZ80JkYI0LZSMk="; + hash = "sha256-vbligrFrCd7BiPV8n1iRIlurPNirJKOiD4/P5qEpirg="; }; # Cargo.lock file is sometimes behind actual release which throws an error, @@ -42,7 +38,9 @@ buildPythonPackage rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes."numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw="; + outputHashes = { + "numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw="; + }; }; buildAndTestSubdir = "py-polars"; @@ -50,8 +48,6 @@ buildPythonPackage rec { # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - # trick taken from the polars repo since there seems to be a problem # with simd enabled with our stable rust (instead of nightly). maturinBuildFlags = [ @@ -76,6 +72,7 @@ buildPythonPackage rec { [ rust-jemalloc-sys' ] ++ lib.optionals stdenv.isDarwin [ libiconv + darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -92,11 +89,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "polars" ]; - meta = with lib; { + meta = { description = "Fast multi-threaded DataFrame library"; homepage = "https://github.com/pola-rs/polars"; changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; }; }