Skip to content

Commit

Permalink
cleanup and up version
Browse files Browse the repository at this point in the history
  • Loading branch information
mikejohnson51 committed Nov 1, 2024
1 parent 0e7ef89 commit 02ce5d5
Show file tree
Hide file tree
Showing 38 changed files with 200 additions and 3,122 deletions.
10 changes: 3 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Package: hydrofabric
Type: Package
Title: Easily Install and Load 'hydrofabric' tools
Description: The 'hydrofabric' meta package loads a set of packages that work in harmony to complete hydroscience tasks.
Version: 0.1.0
Version: 0.2.0
Authors@R:
c(person(given = "Mike",
family = "Johnson",
role = c("aut", "cre"),
email = "[email protected]"),
person("NOAA", role = c("fnd")),
person("USGS", role = c("fnd")),
person("USGS", role = c("ctb")),
person("Lynker", role = c("fnd")))
Maintainer: Mike Johnson <[email protected]>
BugReports: https://github.com/NOAA-OWP/hydrofabric
Expand All @@ -21,17 +21,14 @@ Imports:
cli (>= 3.6.1),
climateR,
crayon (>= 1.4.1),
DBI,
dplyr,
glue,
grDevices,
hydrofab,
hfsubsetR,
jsonlite,
ngen.hydrofab,
nhdplusTools,
purrr,
RSQLite,
rstudioapi,
sf,
terra,
Expand All @@ -44,10 +41,9 @@ RoxygenNote: 7.3.1
Suggests:
testthat (>= 3.0.0),
Remotes:
mikejohnson51/hydrofab,
NOAA-OWP/hydrofab,
mikejohnson51/zonal,
mikejohnson51/climateR,
mikejohnson51/ngen.hydrofab,
lynker-spatial/hfsubsetR
Config/testthat/edition: 3
VignetteBuilder: knitr
14 changes: 1 addition & 13 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,19 @@

S3method(print,hydrofabric_conflicts)
export(append_style)
export(as_sqlite)
export(create_style_row)
export(glue)
export(hydrofabric_conflicts)
export(hydrofabric_packages)
export(open_dataset)
export(read_parquet)
export(read_qml)
export(read_sf_dataset_sqlite)
export(write_parquet)
import(climateR, except = c(plot))
import(climateR, except = plot)
import(dplyr, except = c(intersect, union))
import(hydrofab)
import(ngen.hydrofab)
import(nhdplusTools)
import(sf)
import(terra)
import(zonal)
importFrom(DBI,dbConnect)
importFrom(DBI,dbDisconnect)
importFrom(DBI,dbListTables)
importFrom(RSQLite,SQLite)
importFrom(arrow,open_dataset)
importFrom(arrow,read_parquet)
importFrom(arrow,write_parquet)
importFrom(glue,glue)
importFrom(purrr,keep)
importFrom(purrr,map)
7 changes: 5 additions & 2 deletions R/attach.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
core <- c("dplyr", "climateR",
"nhdplusTools", "hydrofab", "zonal", "hfsubsetR", 'ngen.hydrofab',
"sf", "terra")
"hydroloom", "hydrofab", "zonal", "hfsubsetR",
"sf", "terra") |>
sort()

core_unloaded <- function() {
search <- paste0("package:", core)
Expand Down Expand Up @@ -32,6 +33,7 @@ hydrofabric_attach <- function() {
)

versions <- vapply(to_load, package_version, character(1))

packages <- paste0(
crayon::green(cli::symbol$tick), " ", crayon::blue(format(to_load)), " ",
crayon::col_align(versions, max(crayon::col_nchar(versions)))
Expand All @@ -40,6 +42,7 @@ hydrofabric_attach <- function() {
if (length(packages) %% 2 == 1) {
packages <- append(packages, "")
}

col1 <- seq_len(length(packages) / 2)
info <- paste0(packages[col1], " ", packages[-col1])

Expand Down
16 changes: 1 addition & 15 deletions R/package.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@

NULL

#' @importFrom DBI dbConnect dbDisconnect dbListTables
#' @importFrom RSQLite SQLite
#' @importFrom arrow read_parquet write_parquet open_dataset
#' @importFrom glue glue

#' @rawNamespace import(climateR, except = c(plot))
#' @rawNamespace import(climateR, except = plot)
#' @rawNamespace import(dplyr, except = c(intersect, union))

#' @import hydrofab
Expand All @@ -23,14 +18,5 @@ NULL
#' @import terra
#' @import sf

#' @export
arrow::read_parquet

#' @export
arrow::write_parquet

#' @export
arrow::open_dataset

#' @export
glue::glue
48 changes: 0 additions & 48 deletions R/sqlite.R

This file was deleted.

2 changes: 1 addition & 1 deletion data-raw/hf_dm.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
library(dm)

hf_dm = list(
flowlines = data.frame(
flowpaths = data.frame(
id = integer(1L),
toid = integer(1L),
mainstem = integer(1L),
Expand Down
21 changes: 0 additions & 21 deletions man/as_sqlite.Rd

This file was deleted.

2 changes: 1 addition & 1 deletion man/hydrofabric-package.Rd

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

17 changes: 0 additions & 17 deletions man/read_sf_dataset_sqlite.Rd

This file was deleted.

5 changes: 0 additions & 5 deletions man/reexports.Rd

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

31 changes: 0 additions & 31 deletions runners/01_update_reference_and_refactored_fabrics.R

This file was deleted.

Loading

0 comments on commit 02ce5d5

Please sign in to comment.