Merge branch 'release-0.1.17'

EnergyEconomyDecoupling · Nov 15, 2023 · bba2e9c · bba2e9c
2 parents fd5d92d + 3f2d6ee
commit bba2e9c
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 59 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: PFUSetup
 Title: Functions to Set Up the Directory Structure of the PFU Database
-Version: 0.1.16
-Date: 2023-11-06
+Version: 0.1.17
+Date: 2023-11-15
 Authors@R: 
     person(given = "Matthew",
            family = "Heun",

diff --git a/NEWS.md b/NEWS.md
@@ -7,10 +7,22 @@ output: html_document
 Cite all releases with doi [10.5281/zenodo.5228359](https://doi.org/10.5281/zenodo.5228359), 
 which always resolves to the latest release.
 
-# PFUSetup 0.1.16
+
+# PFUSetup 0.1.17 (2023-11-15)
+
+* Changed name of tab in versions and products.xlsx file.
+* No new tests.
+    - Still at 77 tests, all passing.
+    - Test coverage remains at 100%.
+
+
+# PFUSetup 0.1.16 (2023-11-11) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10114842.svg)](https://doi.org/10.5281/zenodo.10114842)
 
 * `pin_versions()` now moved to package PFUPipelineTools.
 * Paths to Exiobase energy flows now added.
+* New tests for new functions.
+    - Now at 77 tests, all passing.
+    - Test coverage remains at 100%.
 
 
 # PFUSetup 0.1.15 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10059871.svg)](https://doi.org/10.5281/zenodo.10059871)

diff --git a/R/pin_functions.R b/R/pin_functions.R
@@ -13,7 +13,7 @@
 #'                                   that contains a concordance table of versions
 #'                                   and pin names.
 #'                                   Default is `get_abs_paths()[["versions_and_products_path"]]`.
-#' @param version_table_tab The name of the `version_table` tab in the
+#' @param product_table_tab The name of the `version_table` tab in the
 #'                          versions and products file.
 #'                          Default is "version_table".
 #' @param product_column The name of the product column in the version table.
@@ -32,15 +32,15 @@
 #' pin_versions(1.1)
 pin_versions <- function(database_version,
                          versions_and_products_path = get_abs_paths()[["versions_and_products_path"]],
-                         version_table_tab = "version_table",
+                         product_table_tab = "product_table",
                          product_column = "product",
                          pin_name_column = "pin_name") {
   if (is.numeric(database_version)) {
     database_version <- paste0("v", database_version)
   }
 
   # Get the version table.
-  cols <- readxl::read_excel(path = versions_and_products_path, sheet = version_table_tab) |>
+  cols <- readxl::read_excel(path = versions_and_products_path, sheet = product_table_tab) |>
     dplyr::select(dplyr::any_of(c(pin_name_column, database_version)))
 
   if (!(database_version %in% names(cols))) {

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -2,5 +2,5 @@ pandoc: 3.1.1
 pkgdown: 2.0.7
 pkgdown_sha: ~
 articles: {}
-last_built: 2023-10-31T23:40Z
+last_built: 2023-11-15T14:46Z