Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to chrono 0.4.34 #5385

Merged
merged 3 commits into from
Feb 11, 2024
Merged

Update to chrono 0.4.34 #5385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0cf9ae
Update to chrono 0.4.34
tustvold Feb 11, 2024
fc1e967
Update JSON test
tustvold Feb 11, 2024
63a3804
Fix MSRV
tustvold Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ jobs:
uses: ./.github/actions/setup-builder
- name: Install cargo-msrv
run: cargo install cargo-msrv
- name: Downgrade arrow dependencies
run: cargo update -p ahash --precise 0.8.7
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahash 0.8.8 bumped the MSRV to 1.72

- name: Check arrow
working-directory: arrow
run: cargo msrv verify
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ arrow-select = { version = "50.0.0", path = "./arrow-select" }
arrow-string = { version = "50.0.0", path = "./arrow-string" }
parquet = { version = "50.0.0", path = "./parquet", default-features = false }

chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
chrono = { version = "0.4.34", default-features = false, features = ["clock"] }
16 changes: 8 additions & 8 deletions arrow-cast/src/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,9 @@ mod tests {
assert_eq!(pretty[2], "0 days 0 hours 0 mins 0.000001000 secs");
assert_eq!(iso[3], "-PT0.000001S");
assert_eq!(pretty[3], "0 days 0 hours 0 mins -0.000001000 secs");
assert_eq!(iso[4], "P45DT50554.123456789S");
assert_eq!(iso[4], "PT3938554.123456789S");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did these values change? They look closer to the pretty version with the former formatting (like 45 days)

Is this something we need to change in pretty print?

Copy link
Contributor Author

@tustvold tustvold Feb 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per the PR description - chronotope/chrono#1328 changed the formatting to be more "correct". As the pretty version is focused on human readability, not precision, I am not sure it needs to be updated

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense

assert_eq!(pretty[4], "45 days 14 hours 2 mins 34.123456789 secs");
assert_eq!(iso[5], "-P45DT50554.123456789S");
assert_eq!(iso[5], "-PT3938554.123456789S");
assert_eq!(pretty[5], "-45 days -14 hours -2 mins -34.123456789 secs");

let array = DurationMicrosecondArray::from(vec![
Expand All @@ -1037,9 +1037,9 @@ mod tests {
assert_eq!(pretty[2], "0 days 0 hours 0 mins 0.001000 secs");
assert_eq!(iso[3], "-PT0.001S");
assert_eq!(pretty[3], "0 days 0 hours 0 mins -0.001000 secs");
assert_eq!(iso[4], "P45DT50554.123456S");
assert_eq!(iso[4], "PT3938554.123456S");
assert_eq!(pretty[4], "45 days 14 hours 2 mins 34.123456 secs");
assert_eq!(iso[5], "-P45DT50554.123456S");
assert_eq!(iso[5], "-PT3938554.123456S");
assert_eq!(pretty[5], "-45 days -14 hours -2 mins -34.123456 secs");

let array = DurationMillisecondArray::from(vec![
Expand All @@ -1061,9 +1061,9 @@ mod tests {
assert_eq!(pretty[2], "0 days 0 hours 0 mins 1.000 secs");
assert_eq!(iso[3], "-PT1S");
assert_eq!(pretty[3], "0 days 0 hours 0 mins -1.000 secs");
assert_eq!(iso[4], "P45DT50554.123S");
assert_eq!(iso[4], "PT3938554.123S");
assert_eq!(pretty[4], "45 days 14 hours 2 mins 34.123 secs");
assert_eq!(iso[5], "-P45DT50554.123S");
assert_eq!(iso[5], "-PT3938554.123S");
assert_eq!(pretty[5], "-45 days -14 hours -2 mins -34.123 secs");

let array = DurationSecondArray::from(vec![
Expand All @@ -1085,9 +1085,9 @@ mod tests {
assert_eq!(pretty[2], "0 days 0 hours 16 mins 40 secs");
assert_eq!(iso[3], "-PT1000S");
assert_eq!(pretty[3], "0 days 0 hours -16 mins -40 secs");
assert_eq!(iso[4], "P45DT50554S");
assert_eq!(iso[4], "PT3938554S");
assert_eq!(pretty[4], "45 days 14 hours 2 mins 34 secs");
assert_eq!(iso[5], "-P45DT50554S");
assert_eq!(iso[5], "-PT3938554S");
assert_eq!(pretty[5], "-45 days -14 hours -2 mins -34 secs");
}

Expand Down
2 changes: 1 addition & 1 deletion arrow-json/src/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ mod tests {

assert_json_eq(
&buf,
r#"{"duration_sec":"PT120S","duration_msec":"PT0.120S","duration_usec":"PT0.000120S","duration_nsec":"PT0.000000120S","name":"a"}
r#"{"duration_sec":"PT120S","duration_msec":"PT0.12S","duration_usec":"PT0.00012S","duration_nsec":"PT0.00000012S","name":"a"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks better

{"name":"b"}
"#,
);
Expand Down
Loading