Skip to content

Commit

Permalink
Merge pull request #95 from isoverse/dev
Browse files Browse the repository at this point in the history
update master to version 1.0.17
  • Loading branch information
sebkopf committed Feb 13, 2020
2 parents 6a00f37 + 14d9ab8 commit 7b6ceee
Show file tree
Hide file tree
Showing 242 changed files with 8,829 additions and 4,585 deletions.
4 changes: 3 additions & 1 deletion .Rbuildignore
Expand Up @@ -16,4 +16,6 @@
^README\.Rmd$
^logo\.png$
^vignettes/cache$
^vignettes/fig_output$
^vignettes/fig_output$
^doc$
^Meta$
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -8,6 +8,9 @@
.Rprofile
# Example code in package build process
*.xlsx
*.rds
*.rda
*.feather
*-Ex.R
# Output files from R CMD build
/*.tar.gz
Expand Down Expand Up @@ -43,3 +46,5 @@ vignettes/**/*.pdf
# documentation
!/docs/*
inst/doc
doc
Meta
8 changes: 4 additions & 4 deletions DESCRIPTION
@@ -1,7 +1,7 @@
Package: isoreader
Title: Read IRMS data files
Description: R interface to IRMS (isotope ratio mass spectrometry) file formats typically used in stable isotope geochemistry.
Version: 1.0.12
Version: 1.1.0
Authors@R: person("Sebastian", "Kopf", email = "sebastian.kopf@colorado.edu", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-2044-0201"))
URL: https://github.com/isoverse/isoreader
BugReports: https://github.com/isoverse/isoreader/issues
Expand All @@ -11,9 +11,9 @@ Imports:
methods,
R.utils,
magrittr,
rlang (>= 0.1.4),
rlang (>= 0.4.4),
glue,
tidyselect (>= 0.2.3),
tidyselect (>= 1.0.0),
vctrs,
tibble,
dplyr (>= 0.7.4),
Expand Down Expand Up @@ -41,4 +41,4 @@ License: GPL (>= 2) | file LICENSE
Encoding: UTF-8
LazyData: true
VignetteBuilder: knitr
RoxygenNote: 6.1.1
RoxygenNote: 7.0.2
5 changes: 5 additions & 0 deletions Makefile
Expand Up @@ -11,5 +11,10 @@ vignettes:
check:
Rscript -e "devtools::check()"

# test package functionality without all example files
auto_test:
R -q -e "rm(list = ls()); options("isoreader.run_file_tests" = FALSE); testthat::auto_test_package()"

# test all example files
auto_test_all:
R -q -e "rm(list = ls()); testthat::auto_test_package()"
16 changes: 12 additions & 4 deletions NAMESPACE
Expand Up @@ -36,6 +36,7 @@ S3method(print,continuous_flow)
S3method(print,dual_inlet)
S3method(print,iso_file)
S3method(print,iso_file_list)
S3method(print,scan)
S3method(rename,iso_file)
S3method(rename,iso_file_list)
S3method(select,iso_file)
Expand Down Expand Up @@ -85,6 +86,7 @@ export(iso_export_to_rda)
export(iso_filter_files)
export(iso_filter_files_with_problems)
export(iso_find_absolute_path_roots)
export(iso_get_all_data)
export(iso_get_bgrd_data)
export(iso_get_data)
export(iso_get_data_summary)
Expand All @@ -95,7 +97,10 @@ export(iso_get_problems_summary)
export(iso_get_raw_data)
export(iso_get_reader_example)
export(iso_get_reader_examples)
export(iso_get_reader_examples_folder)
export(iso_get_resistors)
export(iso_get_resistors_info)
export(iso_get_standards)
export(iso_get_standards_info)
export(iso_get_supported_file_types)
export(iso_get_units)
Expand All @@ -107,6 +112,7 @@ export(iso_is_dual_inlet)
export(iso_is_file)
export(iso_is_file_list)
export(iso_is_object)
export(iso_is_scan)
export(iso_make_units_explicit)
export(iso_make_units_implicit)
export(iso_mutate_file_info)
Expand All @@ -118,7 +124,9 @@ export(iso_plot_raw_data)
export(iso_read_continuous_flow)
export(iso_read_dual_inlet)
export(iso_read_scan)
export(iso_register_continuous_flow_file_reader)
export(iso_register_dual_inlet_file_reader)
export(iso_register_scan_file_reader)
export(iso_rename_file_info)
export(iso_reread_archive)
export(iso_reread_files)
Expand Down Expand Up @@ -178,10 +186,8 @@ importFrom(dplyr,vars)
importFrom(feather,write_feather)
importFrom(future,availableCores)
importFrom(future,future)
importFrom(future,multiprocess)
importFrom(future,plan)
importFrom(future,resolved)
importFrom(future,sequential)
importFrom(future,value)
importFrom(glue,glue)
importFrom(lazyeval,as.lazy)
Expand Down Expand Up @@ -223,9 +229,13 @@ importFrom(rhdf5,h5readAttributes)
importFrom(rlang,"!!!")
importFrom(rlang,"!!")
importFrom(rlang,":=")
importFrom(rlang,.data)
importFrom(rlang,UQ)
importFrom(rlang,as_label)
importFrom(rlang,enexpr)
importFrom(rlang,enquo)
importFrom(rlang,eval_tidy)
importFrom(rlang,expr)
importFrom(rlang,f_lhs)
importFrom(rlang,f_rhs)
importFrom(rlang,get_expr)
Expand All @@ -237,7 +247,6 @@ importFrom(rlang,quo)
importFrom(rlang,quo_is_null)
importFrom(rlang,quo_is_symbol)
importFrom(rlang,quo_squash)
importFrom(rlang,quo_text)
importFrom(rlang,quos)
importFrom(rlang,sym)
importFrom(stats,embed)
Expand Down Expand Up @@ -268,7 +277,6 @@ importFrom(tidyselect,ends_with)
importFrom(tidyselect,everything)
importFrom(tidyselect,matches)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_select)
importFrom(utils,head)
importFrom(utils,modifyList)
importFrom(utils,packageVersion)
Expand Down

0 comments on commit 7b6ceee

Please sign in to comment.