Skip to content

Commit

Permalink
Merge pull request #55 from hubverse-org/hotfix/use-cran-arrow
Browse files Browse the repository at this point in the history
Hotfix / Use CRAN arrow
  • Loading branch information
zkamvar authored Aug 26, 2024
2 parents ef58779 + 2af2190 commit c9d55de
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 57 deletions.
7 changes: 3 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: hubData
Title: Tools for accessing and working with hubverse data
Version: 1.2.1
Version: 1.2.2
Authors@R:
c(person("Anna", "Krystalli", , "annakrystalli@googlemail.com", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-2378-4915")),
Expand All @@ -20,7 +20,7 @@ Config/testthat/edition: 3
URL: https://github.com/hubverse-org/hubData
BugReports: https://github.com/hubverse-org/hubData/issues
Imports:
arrow (>= 12.0.0),
arrow (>= 17.0.0),
checkmate,
cli,
dplyr (>= 1.1.0),
Expand All @@ -47,8 +47,7 @@ Suggests:
rmarkdown,
testthat (>= 3.2.0)
Remotes:
hubverse-org/hubUtils,
apache/arrow/r@apache-arrow-15.0.2
hubverse-org/hubUtils
Config/Needs/website: hubverse-org/hubStyle
Depends:
R (>= 2.10)
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# hubData 1.2.2

* Remove dependency on development version of `arrow` package and bump required version to 17.0.0.


# hubData 1.2.1

* Removed dependency on development version of `zoltr` package.
Expand Down
18 changes: 10 additions & 8 deletions man/as_model_out_tbl.Rd

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

39 changes: 22 additions & 17 deletions man/model_id_merge.Rd

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

39 changes: 22 additions & 17 deletions man/model_id_split.Rd

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

2 changes: 1 addition & 1 deletion man/s3_bucket.Rd

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

23 changes: 13 additions & 10 deletions man/validate_model_out_tbl.Rd

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

24 changes: 24 additions & 0 deletions tests/testthat/_snaps/hub-connection.md
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,7 @@
-- Connection schema
Output
mod_out_connection with 3 csv files
8 columns
origin_date: date32[day]
target: string
horizon: int64
Expand Down Expand Up @@ -705,6 +706,7 @@
-- Connection schema
Output
mod_out_connection with 3 csv files
8 columns
origin_date: date32[day]
target: string
horizon: int32
Expand Down Expand Up @@ -766,6 +768,7 @@
-- Connection schema
Output
hub_connection
9 columns
origin_date: date32[day]
target: string
horizon: int32
Expand Down Expand Up @@ -796,6 +799,7 @@
-- Connection schema
Output
hub_connection
9 columns
origin_date: date32[day]
target: string
horizon: int32
Expand Down Expand Up @@ -966,6 +970,7 @@
-- Connection schema
Output
mod_out_connection with 3 csv files
8 columns
origin_date: date32[day]
target: string
horizon: int64
Expand Down Expand Up @@ -1382,6 +1387,7 @@
-- Connection schema
Output
hub_connection with 4 Parquet files
9 columns
origin_date: date32[day]
target: string
horizon: int32
Expand Down Expand Up @@ -1586,6 +1592,22 @@
Error in `connect_hub()`:
x 'hub-config' directory not found in root of Hub.

# connect_hub fails when skip_checks is true and hub has multiple file types

Code
connect_hub(hub_path, skip_checks = TRUE)
Condition
Error in `connect_hub()`:
! Skip_checks cannot be TRUE when there are multiple file formats in the model output directory ("csv" and "parquet").

# connect_model_output fails when skip_checks is true and hub has multiple file types

Code
connect_model_output(mod_out_path, skip_checks = TRUE)
Condition
Error in `connect_model_output()`:
! Skip_checks cannot be TRUE when there are multiple file formats in the model output directory ("csv" and "parquet").

# connect_hub detects unopenned files correctly

Code
Expand All @@ -1610,6 +1632,7 @@
-- Connection schema
Output
hub_connection with 8 csv files
8 columns
origin_date: date32[day]
horizon: int32
location: string
Expand Down Expand Up @@ -1639,6 +1662,7 @@
-- Connection schema
Output
hub_connection with 9 csv files
8 columns
origin_date: date32[day]
horizon: int32
location: string
Expand Down

0 comments on commit c9d55de

Please # to comment.