Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
"name": "Check arrow2-0-16",
"run": "cargo check -p marrow --features arrow2-0-16"
},
{
"name": "Check arrow-58",
"run": "cargo check -p marrow --features arrow-58"
},
{
"name": "Check arrow-57",
"run": "cargo check -p marrow --features arrow-57"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
"name": "Check arrow2-0-16",
"run": "cargo check -p marrow --features arrow2-0-16"
},
{
"name": "Check arrow-58",
"run": "cargo check -p marrow --features arrow-58"
},
{
"name": "Check arrow-57",
"run": "cargo check -p marrow --features arrow-57"
Expand Down
61 changes: 60 additions & 1 deletion Cargo.lock

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

6 changes: 5 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Change log

## 0.2.6

- Add `arrow=58` support

## 0.2.5

- Add `arrow=57` support.
- Add `arrow=57` support

Thanks [@lonless9](https://github.com/lonless9) for the [contribution](https://github.com/chmp/marrow/pull/33)

Expand Down
9 changes: 7 additions & 2 deletions marrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
edition = "2021"

name = "marrow"
version = "0.2.5"
version = "0.2.6"
authors = ["Christopher Prohm <mail@cprohm.de>"]
description = "Minimalist Arrow interop"
readme = "../Readme.md"
Expand All @@ -13,7 +13,7 @@ rust-version = "1.70.0"

[package.metadata.docs.rs]
# arrow-version:replace: features = ["arrow2-0-17", "arrow-{version}", "serde"]
features = ["arrow2-0-17", "arrow-57", "serde"]
features = ["arrow2-0-17", "arrow-58", "serde"]

[features]
default = []
Expand All @@ -23,6 +23,7 @@ serde = ["dep:serde"]

# support for different arrow versions
# arrow-version:insert: arrow-{version} = ["dep:arrow-array-{version}", "dep:arrow-schema-{version}", "dep:arrow-data-{version}", "dep:arrow-buffer-{version}"]
arrow-58 = ["dep:arrow-array-58", "dep:arrow-schema-58", "dep:arrow-data-58", "dep:arrow-buffer-58"]
arrow-57 = ["dep:arrow-array-57", "dep:arrow-schema-57", "dep:arrow-data-57", "dep:arrow-buffer-57"]
arrow-56 = ["dep:arrow-array-56", "dep:arrow-schema-56", "dep:arrow-data-56", "dep:arrow-buffer-56"]
arrow-55 = ["dep:arrow-array-55", "dep:arrow-schema-55", "dep:arrow-data-55", "dep:arrow-buffer-55"]
Expand Down Expand Up @@ -56,6 +57,7 @@ half = { version = "2", default-features = false }
serde = { version = "1.0", default-features = false, features = ["std", "derive"], optional = true }

# arrow-version:insert: arrow-array-{version} = {{ package = "arrow-array", version = "{version}", optional = true, default-features = false }}
arrow-array-58 = { package = "arrow-array", version = "58", optional = true, default-features = false }
arrow-array-57 = { package = "arrow-array", version = "57", optional = true, default-features = false }
arrow-array-56 = { package = "arrow-array", version = "56", optional = true, default-features = false }
arrow-array-55 = { package = "arrow-array", version = "55", optional = true, default-features = false }
Expand All @@ -79,6 +81,7 @@ arrow-array-38 = { package = "arrow-array", version = "38", optional = true, def
arrow-array-37 = { package = "arrow-array", version = "37", optional = true, default-features = false }

# arrow-version:insert: arrow-buffer-{version} = {{ package = "arrow-buffer", version = "{version}", optional = true, default-features = false }}
arrow-buffer-58 = { package = "arrow-buffer", version = "58", optional = true, default-features = false }
arrow-buffer-57 = { package = "arrow-buffer", version = "57", optional = true, default-features = false }
arrow-buffer-56 = { package = "arrow-buffer", version = "56", optional = true, default-features = false }
arrow-buffer-55 = { package = "arrow-buffer", version = "55", optional = true, default-features = false }
Expand All @@ -102,6 +105,7 @@ arrow-buffer-38 = { package = "arrow-buffer", version = "38", optional = true, d
arrow-buffer-37 = { package = "arrow-buffer", version = "37", optional = true, default-features = false }

# arrow-version:insert: arrow-data-{version} = {{ package = "arrow-data", version="{version}", optional = true, default-features = false }}
arrow-data-58 = { package = "arrow-data", version="58", optional = true, default-features = false }
arrow-data-57 = { package = "arrow-data", version="57", optional = true, default-features = false }
arrow-data-56 = { package = "arrow-data", version="56", optional = true, default-features = false }
arrow-data-55 = { package = "arrow-data", version="55", optional = true, default-features = false }
Expand All @@ -125,6 +129,7 @@ arrow-data-38 = { package = "arrow-data", version="38", optional = true, default
arrow-data-37 = { package = "arrow-data", version="37", optional = true, default-features = false }

# arrow-version:insert: arrow-schema-{version} = {{ package = "arrow-schema", version = "{version}", optional = true, default-features = false }}
arrow-schema-58 = { package = "arrow-schema", version = "58", optional = true, default-features = false }
arrow-schema-57 = { package = "arrow-schema", version = "57", optional = true, default-features = false }
arrow-schema-56 = { package = "arrow-schema", version = "56", optional = true, default-features = false }
arrow-schema-55 = { package = "arrow-schema", version = "55", optional = true, default-features = false }
Expand Down
7 changes: 6 additions & 1 deletion marrow/src/impl_arrow/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
#![cfg_attr(any(), rustfmt::skip)]

// arrow-version:insert: #[cfg(feature = "arrow-{version}")]{\n}mod arrow_{version} {{{\n} use {{arrow_array_{version} as arrow_array, arrow_buffer_{version} as arrow_buffer, arrow_data_{version} as arrow_data, arrow_schema_{version} as arrow_schema}};{\n} include!("impl_api_53.rs");{\n}}}
#[cfg(feature = "arrow-58")]
mod arrow_58 {
use {arrow_array_58 as arrow_array, arrow_buffer_58 as arrow_buffer, arrow_data_58 as arrow_data, arrow_schema_58 as arrow_schema};
include!("impl_api_53.rs");
}
#[cfg(feature = "arrow-57")]
mod arrow_57 {
use {arrow_array_57 as arrow_array, arrow_buffer_57 as arrow_buffer, arrow_data_57 as arrow_data, arrow_schema_57 as arrow_schema};
Expand Down Expand Up @@ -106,4 +111,4 @@ mod arrow_38 {
mod arrow_37 {
use {arrow_array_37 as arrow_array, arrow_buffer_37 as arrow_buffer, arrow_data_37 as arrow_data, arrow_schema_37 as arrow_schema};
include!("impl_api_37.rs");
}
}
1 change: 1 addition & 0 deletions marrow/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
//! | Feature | Arrow Version |
//! |---------------|---------------|
// arrow-version:insert: //! | `arrow-{version}` | `arrow={version}` |
//! | `arrow-58` | `arrow=58` |
//! | `arrow-56` | `arrow=56` |
//! | `arrow-55` | `arrow=55` |
//! | `arrow-54` | `arrow=54` |
Expand Down
5 changes: 4 additions & 1 deletion test_with_arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ edition = "2021"
[features]

# arrow-version:insert: arrow-{version} = ["marrow/arrow-{version}", "dep:arrow-array-{version}", "dep:arrow-schema-{version}"]
arrow-58 = ["marrow/arrow-58", "dep:arrow-array-58", "dep:arrow-schema-58"]
arrow-57 = ["marrow/arrow-57", "dep:arrow-array-57", "dep:arrow-schema-57"]
arrow-56 = ["marrow/arrow-56", "dep:arrow-array-56", "dep:arrow-schema-56"]
arrow-55 = ["marrow/arrow-55", "dep:arrow-array-55", "dep:arrow-schema-55"]
Expand Down Expand Up @@ -39,6 +40,7 @@ serde_json = "1"
chrono = { version = "0.4", default-features = false }

# arrow-version:insert: arrow-array-{version} = {{ package = "arrow-array", version="{version}", optional = true, default-features = false }}
arrow-array-58 = { package = "arrow-array", version="58", optional = true, default-features = false }
arrow-array-57 = { package = "arrow-array", version="57", optional = true, default-features = false }
arrow-array-56 = { package = "arrow-array", version="56", optional = true, default-features = false }
arrow-array-55 = { package = "arrow-array", version="55", optional = true, default-features = false }
Expand All @@ -62,6 +64,7 @@ arrow-array-38 = { package = "arrow-array", version="38", optional = true, defau
arrow-array-37 = { package = "arrow-array", version="37", optional = true, default-features = false }

# arrow-version:insert: arrow-schema-{version} = {{ package = "arrow-schema", version = "{version}", optional = true, default-features = false, features = ["serde"] }}
arrow-schema-58 = { package = "arrow-schema", version = "58", optional = true, default-features = false, features = ["serde"] }
arrow-schema-57 = { package = "arrow-schema", version = "57", optional = true, default-features = false, features = ["serde"] }
arrow-schema-56 = { package = "arrow-schema", version = "56", optional = true, default-features = false, features = ["serde"] }
arrow-schema-55 = { package = "arrow-schema", version = "55", optional = true, default-features = false, features = ["serde"] }
Expand All @@ -82,4 +85,4 @@ arrow-schema-41 = { package = "arrow-schema", version = "41", optional = true, d
arrow-schema-40 = { package = "arrow-schema", version = "40", optional = true, default-features = false, features = ["serde"] }
arrow-schema-39 = { package = "arrow-schema", version = "39", optional = true, default-features = false, features = ["serde"] }
arrow-schema-38 = { package = "arrow-schema", version = "38", optional = true, default-features = false, features = ["serde"] }
arrow-schema-37 = { package = "arrow-schema", version = "37", optional = true, default-features = false, features = ["serde"] }
arrow-schema-37 = { package = "arrow-schema", version = "37", optional = true, default-features = false, features = ["serde"] }
1 change: 1 addition & 0 deletions test_with_arrow/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ macro_rules! define_test_module {
}

// arrow-version:insert: define_test_module!("arrow-{version}", arrow_{version}, arrow_array_{version}, arrow_schema_{version}, utils, arrays, data_types,struct_arrays, fixed_size_binary_arrays, intervals, union_arrays, views);
define_test_module!("arrow-58", arrow_58, arrow_array_58, arrow_schema_58, utils, arrays, data_types,struct_arrays, fixed_size_binary_arrays, intervals, union_arrays, views);
define_test_module!("arrow-56", arrow_56, arrow_array_56, arrow_schema_56, utils, arrays, data_types,struct_arrays, fixed_size_binary_arrays, intervals, union_arrays, views);
define_test_module!("arrow-55", arrow_55, arrow_array_55, arrow_schema_55, utils, arrays, data_types,struct_arrays, fixed_size_binary_arrays, intervals, union_arrays, views);
define_test_module!("arrow-54", arrow_54, arrow_array_54, arrow_schema_54, utils, arrays, data_types,struct_arrays, fixed_size_binary_arrays, intervals, union_arrays, views);
Expand Down
1 change: 1 addition & 0 deletions x.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

all_arrow_features = [
# arrow-version:insert: "arrow-{version}",
"arrow-58",
"arrow-57",
"arrow-56",
"arrow-55",
Expand Down