Skip to content

Commit

Permalink
move to parquet format + document and fucntions keywording + organize…
Browse files Browse the repository at this point in the history
… R folder by modules
  • Loading branch information
langbart committed Aug 29, 2024
1 parent f6e0ebf commit 9301f39
Show file tree
Hide file tree
Showing 49 changed files with 1,292 additions and 1,380 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ on:
types: [published]
workflow_dispatch:

name: pkgdown
name: pkgdown.yaml

permissions: read-all

jobs:
pkgdown:
Expand All @@ -22,7 +24,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand All @@ -41,7 +43,7 @@ jobs:

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.4.1
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ docs
*.xlsx
*.csv
*.tsv
*.parquet
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: peskas.zanzibar.data.pipeline
Title: Functions to Implement the Zanzibar Small Scale Fisheries
Data Pipeline
Version: 0.2.0
Version: 1.0.0
Authors@R:
c(person(given = "Lorenzo",
family = "Longobardi",
Expand All @@ -22,12 +22,12 @@ Imports:
logger,
magrittr,
purrr,
readr,
stringr,
tidyr,
rlang,
lubridate,
taxize
taxize,
arrow
Suggests:
covr,
pkgdown,
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN install2.r --error --skipinstalled \
logger \
magrittr \
purrr \
readr \
arrow \
stringr \
tidyr \
lubridate \
Expand All @@ -30,9 +30,7 @@ RUN install2.r --error --skipinstalled \
univOutl \
taxize \
reticulate \
stringi \
taxize
stringi

#RUN Rscript -e "devtools::install_version('glmmTMB', version = '1.1.5')"
# Rstudio interface preferences
COPY rstudio-prefs.json /home/rstudio/.config/rstudio/rstudio-prefs.json
6 changes: 2 additions & 4 deletions Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN install2.r --error --skipinstalled \
logger \
magrittr \
purrr \
readr \
arrow \
stringr \
tidyr \
lubridate \
Expand All @@ -41,10 +41,8 @@ RUN install2.r --error --skipinstalled \
tidytext \
KoboconnectR \
univOutl \
taxize \
reticulate \
stringi \
taxize
stringi

# Install local package
COPY . /home
Expand Down
25 changes: 4 additions & 21 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export("%||%")
export(":=")
export(.data)
export(add_version)
export(alert_outlier)
export(as_label)
export(as_name)
export(cloud_object_name)
Expand All @@ -14,17 +15,19 @@ export(enquo)
export(enquos)
export(expand_taxa)
export(expr)
export(flatten_field)
export(flatten_row)
export(get_preprocessed_surveys)
export(get_validated_surveys)
export(ingest_wcs_surveys)
export(kepler_mapper)
export(preprocess_wcs_surveys)
export(pt_nest_attachments)
export(pt_nest_catch)
export(pt_nest_length)
export(pt_nest_market)
export(pt_nest_trip)
export(read_config)
export(rename_child)
export(retrieve_wcs_surveys)
export(sym)
export(syms)
Expand All @@ -34,27 +37,9 @@ export(validate_length)
export(validate_market)
export(validate_surveys_time)
export(validate_wcs_surveys)
import(dplyr)
import(purrr)
import(stringr)
import(taxize)
import(tidyr)
importFrom(dplyr,case_when)
importFrom(dplyr,coalesce)
importFrom(dplyr,group_by)
importFrom(dplyr,left_join)
importFrom(dplyr,mutate)
importFrom(dplyr,select)
importFrom(dplyr,ungroup)
importFrom(logger,log_info)
importFrom(logger,log_threshold)
importFrom(lubridate,with_tz)
importFrom(magrittr,"%<>%")
importFrom(magrittr,"%>%")
importFrom(magrittr,"%T>%")
importFrom(purrr,map)
importFrom(purrr,reduce)
importFrom(readr,write_rds)
importFrom(rlang,"%||%")
importFrom(rlang,":=")
importFrom(rlang,.data)
Expand All @@ -66,6 +51,4 @@ importFrom(rlang,expr)
importFrom(rlang,sym)
importFrom(rlang,syms)
importFrom(stats,mad)
importFrom(tidyr,nest)
importFrom(tidyr,unnest)
importFrom(utils,globalVariables)
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# peskas.zanzibar.data.pipeline 1.0.0

#### Improvements
- All the functions are now documented and indexed according to keywords
- Thin out the R folder gathering functions by modules

#### Changes
- Move to parquet format rather than CSV/RDS


# peskas.zanzibar.data.pipeline 0.2.0

#### New features
Expand Down
Loading

0 comments on commit 9301f39

Please sign in to comment.