From a56ac9d806fad6a6a1eb22b17d6465e76cecbf23 Mon Sep 17 00:00:00 2001 From: Stijn de Gooijer Date: Fri, 10 Nov 2023 12:48:59 +0100 Subject: [PATCH] ci: Workaround for maturin issue --- Cargo.lock | 212 +-------------------------------------- Cargo.toml | 8 +- py-polars/pyproject.toml | 3 +- 3 files changed, 7 insertions(+), 216 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5ab1ec7ec4a..9fb4f5d9556d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,20 +259,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "attohttpc" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f77d243921b0979fbbd728dd2d5162e68ac8252976797c24eb5b3a6af9090dc" -dependencies = [ - "http", - "log", - "native-tls", - "serde", - "serde_json", - "url", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -338,23 +324,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "aws-creds" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390ad3b77f3e21e01a4a0355865853b681daf1988510b0b15e31c0c4ae7eb0f6" -dependencies = [ - "attohttpc", - "home", - "log", - "quick-xml 0.30.0", - "rust-ini", - "serde", - "thiserror", - "time", - "url", -] - [[package]] name = "aws-http" version = "0.57.1" @@ -1244,7 +1213,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ "powerfmt", - "serde", ] [[package]] @@ -1258,15 +1226,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - [[package]] name = "doc-comment" version = "0.3.3" @@ -1424,21 +1383,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign_vec" version = "0.1.0" @@ -2295,24 +2239,6 @@ dependencies = [ "target-features", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "ndarray" version = "0.15.6" @@ -2471,7 +2397,7 @@ dependencies = [ "itertools 0.11.0", "parking_lot", "percent-encoding", - "quick-xml 0.31.0", + "quick-xml", "rand 0.8.5", "reqwest", "ring", @@ -2497,60 +2423,12 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "openssl" -version = "0.10.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-multimap" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" -dependencies = [ - "dlv-list", - "hashbrown 0.13.2", -] - [[package]] name = "outref" version = "0.5.1" @@ -3284,32 +3162,12 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "python_rust_compiled_function" -version = "0.1.0" -dependencies = [ - "polars", - "polars-arrow", - "pyo3", - "pyo3-build-config", -] - [[package]] name = "quad-rand" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88" -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "quick-xml" version = "0.31.0" @@ -3462,35 +3320,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "read_csv" -version = "0.1.0" -dependencies = [ - "polars", -] - -[[package]] -name = "read_json" -version = "0.1.0" -dependencies = [ - "polars", -] - -[[package]] -name = "read_parquet" -version = "0.1.0" -dependencies = [ - "polars", -] - -[[package]] -name = "read_parquet_cloud" -version = "0.1.0" -dependencies = [ - "aws-creds", - "polars", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -3649,16 +3478,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" -[[package]] -name = "rust-ini" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - [[package]] name = "rustc-demangle" version = "0.1.23" @@ -4131,13 +3950,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" -[[package]] -name = "string_filter" -version = "0.1.0" -dependencies = [ - "polars", -] - [[package]] name = "strum" version = "0.25.0" @@ -4242,19 +4054,6 @@ dependencies = [ "remove_dir_all", ] -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys", -] - [[package]] name = "thiserror" version = "1.0.50" @@ -4282,7 +4081,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", - "itoa", "powerfmt", "serde", "time-core", @@ -4841,14 +4639,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "write_parquet_cloud" -version = "0.1.0" -dependencies = [ - "aws-creds", - "polars", -] - [[package]] name = "xmlparser" version = "0.13.6" diff --git a/Cargo.toml b/Cargo.toml index f25549dd1731..80e8d8b3eef6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,15 +3,15 @@ resolver = "2" members = [ "crates/*", "docs/src/rust", - "examples/*", + # "examples/*", "py-polars", ] default-members = [ "crates/*", ] -exclude = [ - "examples/datasets", -] +# exclude = [ +# "examples/datasets", +# ] [workspace.package] version = "0.34.2" diff --git a/py-polars/pyproject.toml b/py-polars/pyproject.toml index 81659262f8e5..51c880686fec 100644 --- a/py-polars/pyproject.toml +++ b/py-polars/pyproject.toml @@ -1,5 +1,6 @@ [build-system] -requires = ["maturin>=1.2.1,<2"] +# TODO: Set to maturin>=1.3.2 when new maturion version is released +requires = ["maturin @ git+https://github.com/PyO3/maturin.git@main"] build-backend = "maturin" [project]