Skip to content

Commit

Permalink
update arrow (#2833)
Browse files Browse the repository at this point in the history
  • Loading branch information
ritchie46 committed Mar 6, 2022
1 parent 263a556 commit 8a87716
Show file tree
Hide file tree
Showing 19 changed files with 34 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/deploy_manylinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ls -la
rm py-polars/README.md
cp README.md py-polars/README.md
cd py-polars
rustup override set nightly-2022-02-23
rustup override set nightly-2022-03-03
export RUSTFLAGS='-C target-feature=+fxsr,+sse,+sse2,+sse3,+ssse3,+sse4.1+sse4.2,+popcnt,+avx,+fma'
maturin publish \
--skip-existing \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy
- name: Set up Python
Expand All @@ -32,7 +32,7 @@ jobs:
source venv/bin/activate
pip install -r py-polars/build.requirements.txt
cd py-polars
rustup override set nightly-2022-02-23 && RUSTFLAGS="-C embed-bitcode" maturin develop --rustc-extra-args="-C codegen-units=8 -C lto=thin -C target-cpu=native" --release
rustup override set nightly-2022-03-03 && RUSTFLAGS="-C embed-bitcode" maturin develop --rustc-extra-args="-C codegen-units=8 -C lto=thin -C target-cpu=native" --release
cd tests/db-benchmark
Rscript -e 'install.packages("data.table", repos="https://Rdatatable.github.io/data.table")'
Rscript groupby-datagen.R 1e7 1e2 5 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
- uses: Swatinem/rust-cache@v1
- name: Install dependencies
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy, miri
- name: Cache Cargo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-py-mac-universal2-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy
- name: Setup universal2 targets for Rust
Expand All @@ -35,7 +35,7 @@ jobs:
rm py-polars/README.md
cp README.md py-polars/README.md
cd py-polars
rustup override set nightly-2022-02-23
rustup override set nightly-2022-03-03
- name: maturin publish
uses: messense/maturin-action@v1
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-py-release-manylinux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
env:
MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }}
with:
rust-toolchain: nightly-2022-02-23
rust-toolchain: nightly-2022-03-03
manylinux: '2_24'
target: aarch64-unknown-linux-gnu
maturin-version: 0.12.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-py-release-windows-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy
- name: Set up Python
Expand All @@ -37,7 +37,7 @@ jobs:
rm py-polars/README.md
cp README.md py-polars/README.md
cd py-polars
rustup override set nightly-2022-02-23
rustup override set nightly-2022-03-03
export RUSTFLAGS='-C target-feature=+fxsr,+sse,+sse2,+sse3'
maturin publish \
--no-sdist \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy
- name: Set up Node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy
- run: yarn --version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy
- name: Set up Python
Expand All @@ -30,7 +30,7 @@ jobs:
pip install -r py-polars/build.requirements.txt
- name: Run formatting checks
run: |
cd py-polars && black --check . && blackdoc --check . && isort --check . && rustup override set nightly-2022-02-23 && cargo fmt --all -- --check && cd ..
cd py-polars && black --check . && blackdoc --check . && isort --check . && rustup override set nightly-2022-03-03 && cargo fmt --all -- --check && cd ..
- name: Run linting
run: |
cd py-polars && flake8 && cd ..
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Run tests
run: |
export RUSTFLAGS="-C debuginfo=0"
cd py-polars && rustup override set nightly-2022-02-23 && make venv && make test-with-cov
cd py-polars && rustup override set nightly-2022-03-03 && make venv && make test-with-cov
cargo clippy
- name: Check doc examples
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-windows-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
components: rustfmt, clippy
- name: Set up Python
Expand All @@ -28,7 +28,7 @@ jobs:
shell: bash
run: |
export RUSTFLAGS="-C debuginfo=0"
cd py-polars && rustup override set nightly-2022-02-23 && make build-and-test-no-venv
cd py-polars && rustup override set nightly-2022-03-03 && make build-and-test-no-venv
cargo clippy
# test if we can import polars without any requirements
- name: Import polars
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install latest Rust nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-02-23
toolchain: nightly-2022-03-03
override: true
- name: Run tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion nodejs-polars/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2022-02-23
nightly-2022-03-03
2 changes: 1 addition & 1 deletion polars/polars-arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = "Arrow interfaces for Polars DataFrame library"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "a87c758a80facbfbcde4768ad42cdf4c5c2cc5a8", default-features = false }
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "81bfaddb92f432ae25bff4e9fdf200159ecebafe", default-features = false }
# arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "csv_write", default-features = false }
# arrow = { package = "arrow2", version = "0.9", default-features = false, features = ["compute_concatenate"] }
hashbrown = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion polars/polars-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ thiserror = "^1.0"
package = "arrow2"
git = "https://github.com/jorgecarleitao/arrow2"
# git = "https://github.com/ritchie46/arrow2"
rev = "a87c758a80facbfbcde4768ad42cdf4c5c2cc5a8"
rev = "81bfaddb92f432ae25bff4e9fdf200159ecebafe"
# branch = "csv_write"
# version = "0.9"
default-features = false
Expand Down
2 changes: 1 addition & 1 deletion polars/polars-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(clippy::transmute_undefined_repr)]
#![cfg_attr(docsrs, feature(doc_cfg))]
extern crate core;

#[macro_use]
pub mod utils;
pub mod chunked_array;
Expand Down
2 changes: 1 addition & 1 deletion polars/polars-io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private = []
[dependencies]
ahash = "0.7"
anyhow = "1.0"
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "a87c758a80facbfbcde4768ad42cdf4c5c2cc5a8", default-features = false }
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "81bfaddb92f432ae25bff4e9fdf200159ecebafe", default-features = false }
# arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "csv_write", default-features = false }
# arrow = { package = "arrow2", version = "0.9", default-features = false }
csv-core = { version = "0.1.10", optional = true }
Expand Down
1 change: 0 additions & 1 deletion polars/polars-lazy/src/frame/csv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ pub struct LazyCsvReader<'a> {
}

#[cfg(feature = "csv-file")]
#[must_use]
impl<'a> LazyCsvReader<'a> {
pub fn new(path: String) -> Self {
LazyCsvReader {
Expand Down
37 changes: 10 additions & 27 deletions py-polars/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions py-polars/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![allow(clippy::nonstandard_macro_braces)] // needed because clippy does not understand proc macro of pyo3
#![allow(clippy::transmute_undefined_repr)]
#[macro_use]
extern crate polars;
extern crate core;
Expand Down

0 comments on commit 8a87716

Please sign in to comment.