Skip to content

Commit

Permalink
Autoformat TOML files.
Browse files Browse the repository at this point in the history
  • Loading branch information
ghuls authored and ritchie46 committed Nov 10, 2021
1 parent cbc6f2d commit 12f22d7
Show file tree
Hide file tree
Showing 15 changed files with 238 additions and 223 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
key: ubuntu-x86-64-target-cache-nightly
- name: Install dependencies
run: |
cargo install cargo-hack
cargo install cargo-hack dprint
- name: Run formatting checks
run: |
cargo fmt --all -- --check
Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[workspace]
members = [
"polars",
"polars/polars-core",
"polars/polars-io",
"polars/polars-lazy",
"polars",
"polars/polars-core",
"polars/polars-io",
"polars/polars-lazy",
]

#[patch.crates-io]
#packed_simd_2 = { git = 'https://github.com/rust-lang/packed_simd', rev = "e57c7ba11386147e6d2cbad7c88f376aab4bdc86" }
# [patch.crates-io]
# packed_simd_2 = { git = "https://github.com/rust-lang/packed_simd", rev = "e57c7ba11386147e6d2cbad7c88f376aab4bdc86" }
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ changelog-python:

changelog-rust:
docker run -it --env-file .env --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator -u pola-rs -p polars --exclude-labels python

fmt_toml:
dprint fmt
10 changes: 10 additions & 0 deletions dprint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"incremental": true,
"toml": {
},
"includes": ["**/*.{toml}"],
"excludes": [],
"plugins": [
"https://plugins.dprint.dev/toml-0.5.3.wasm"
]
}
2 changes: 1 addition & 1 deletion examples/aggregate_multiple_files_in_chunks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ edition = "2018"
[workspace]

[dependencies]
polars = {path = "../../polars"}
polars = { path = "../../polars" }
rayon = "1.5"
14 changes: 7 additions & 7 deletions js-polars/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
name = "polars"
version = "0.0.1"
authors = ["Ritchie Vink"]
edition = "2018"
repository = "https://github.com/pola-rs/polars"
license = "MIT"
documentation = "https://pola-rs.github.io/polars-book/"
edition = "2018"
homepage = "https://github.com/pola-rs/polars"
license = "MIT"
repository = "https://github.com/pola-rs/polars"

[lib]
crate-type = ["cdylib"]
Expand All @@ -21,13 +21,13 @@ wee_alloc = { version = "0.4.5" }
path = "../polars/polars-core"
default-features = false
features = [
"strings",
"temporal",
"performant",
"strings",
"temporal",
"performant",
]

[profile.release]
# Tell `rustc` to optimize for small code size.
opt-level = "s"

[workspace]
[workspace]
131 changes: 66 additions & 65 deletions polars/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.17.0"
authors = ["ritchie46 <ritchie46@gmail.com>"]
edition = "2018"
license = "MIT"
description = "DataFrame Library based on Apache Arrow"
repository = "https://github.com/pola-rs/polars"
readme = "../README.md"
repository = "https://github.com/pola-rs/polars"
description = "DataFrame Library based on Apache Arrow"

[features]
rows = ["polars-core/rows"]
Expand All @@ -15,21 +15,22 @@ avx512 = ["polars-core/avx512"]
docs = ["polars-core/docs"]
temporal = ["polars-core/temporal", "polars-lazy/temporal", "polars-io/temporal"]
random = ["polars-core/random"]
default = ["docs",
"zip_with",
"csv-file",
"temporal",
"performant",
"plain_fmt",
"dtype-slim",
default = [
"docs",
"zip_with",
"csv-file",
"temporal",
"performant",
"plain_fmt",
"dtype-slim",
]
ndarray = ["polars-core/ndarray"]
# serde support for dataframes and series
serde = ["polars-core/serde"]
parquet = ["polars-io", "polars-core/parquet", "polars-lazy/parquet", "polars-io/parquet"]
lazy = ["polars-core/lazy", "polars-lazy", "polars-lazy/compile"]
# commented out until UB is fixed
#parallel = ["polars-core/parallel"]
# parallel = ["polars-core/parallel"]

# extra utilities for Utf8Chunked
strings = ["polars-core/strings"]
Expand Down Expand Up @@ -101,86 +102,86 @@ private = ["polars-lazy/private"]

# all opt-in datatypes
dtype-full = [
"dtype-date",
"dtype-datetime",
"dtype-time",
"dtype-i8",
"dtype-i16",
"dtype-u8",
"dtype-u16",
"dtype-categorical",
"dtype-date",
"dtype-datetime",
"dtype-time",
"dtype-i8",
"dtype-i16",
"dtype-u8",
"dtype-u16",
"dtype-categorical",
]

# sensible minimal set of opt-in datatypes
dtype-slim = [
"dtype-date",
"dtype-datetime",
"dtype-date",
"dtype-datetime",
]

# opt-in datatypes for Series
dtype-date = ["polars-core/dtype-date", "polars-lazy/dtype-date", "polars-io/dtype-date"]
dtype-datetime= ["polars-core/dtype-datetime", "polars-lazy/dtype-datetime", "polars-io/dtype-datetime"]
dtype-time= ["polars-core/dtype-time", "polars-io/dtype-time"]
dtype-datetime = ["polars-core/dtype-datetime", "polars-lazy/dtype-datetime", "polars-io/dtype-datetime"]
dtype-time = ["polars-core/dtype-time", "polars-io/dtype-time"]
dtype-i8 = ["polars-core/dtype-i8", "polars-lazy/dtype-i8"]
dtype-i16 = ["polars-core/dtype-i16", "polars-lazy/dtype-i16"]
dtype-u8 = ["polars-core/dtype-u8", "polars-lazy/dtype-u8"]
dtype-u16 = ["polars-core/dtype-u16", "polars-lazy/dtype-u16"]
dtype-categorical = ["polars-core/dtype-categorical"]

docs-selection = [
"csv-file",
"json",
"parquet",
"ipc",
"dtype-full",
"pivot",
"is_in",
"sort_multiple",
"rows",
"docs",
"strings",
"object",
"lazy",
"temporal",
"random",
"zip_with",
"round_series",
"checked_arithmetic",
"ndarray",
"downsample",
"repeat_by",
"is_first",
"is_last",
"asof_join",
"cross_join",
"concat_str",
"decompress",
"mode",
"take_opt_iter",
"extract_jsonpath",
"cum_agg",
"rolling_window",
"interpolate",
"diff",
"rank",
"list",
"arange"
"csv-file",
"json",
"parquet",
"ipc",
"dtype-full",
"pivot",
"is_in",
"sort_multiple",
"rows",
"docs",
"strings",
"object",
"lazy",
"temporal",
"random",
"zip_with",
"round_series",
"checked_arithmetic",
"ndarray",
"downsample",
"repeat_by",
"is_first",
"is_last",
"asof_join",
"cross_join",
"concat_str",
"decompress",
"mode",
"take_opt_iter",
"extract_jsonpath",
"cum_agg",
"rolling_window",
"interpolate",
"diff",
"rank",
"list",
"arange",
]

bench = [
"lazy"
"lazy",
]

[dependencies]
polars-core = {version = "0.17.0", path = "./polars-core", features= ["docs", "private"], default-features = false}
polars-io = {version = "0.17.0", path = "./polars-io", features = ["private"], default-features = false, optional=true}
polars-lazy = {version = "0.17.0", path = "./polars-lazy", features=["private"], default-features = false, optional=true}
polars-core = { version = "0.17.0", path = "./polars-core", features = ["docs", "private"], default-features = false }
polars-io = { version = "0.17.0", path = "./polars-io", features = ["private"], default-features = false, optional = true }
polars-lazy = { version = "0.17.0", path = "./polars-lazy", features = ["private"], default-features = false, optional = true }

[dev-dependencies]
ahash = "0.7"
criterion = "0.3"
lazy_static = "1.4"
rand = "0.8"
ahash = "0.7"

# see: https://bheisler.github.io/criterion.rs/book/faq.html
[lib]
Expand All @@ -204,7 +205,7 @@ harness = false

[package.metadata.docs.rs]
# not all because arrow 4.3 does not compile with simd
#all-features = true
# all-features = true
features = ["docs-selection"]
# defines the configuration attribute `docsrs`
rustdoc-args = ["--cfg", "docsrs"]
1 change: 1 addition & 0 deletions polars/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

fmt:
cargo fmt --all
$(MAKE) -C .. fmt_toml

check:
cargo check --all-features \
Expand Down
8 changes: 4 additions & 4 deletions polars/polars-arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ description = "Arrow interfaces for Polars DataFrame library"

[dependencies]
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "6e9ea352b470556e08600274ba2add6106cf6e26", default-features = false }
#arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch="dev", default-features = false }
#arrow = { package = "arrow2", version = "0.7", default-features=false}
thiserror = "^1.0"
# arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "dev", default-features = false }
# arrow = { package = "arrow2", version = "0.7", default-features = false }
num = "^0.4"
thiserror = "^1.0"

[features]
strings = []
strings = []

0 comments on commit 12f22d7

Please sign in to comment.