Merge branch 'release-0.1.9' into develop

EnergyEconomyDecoupling · Jan 4, 2024 · 79577dc · 79577dc
2 parents c31920b + 388dce3
commit 79577dc
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 40 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: CLPFUDatabase
-Title: CLPFUDatabase: A suite of R packages for energy conversion chain analysis
-Version: 0.1.8
+Title: CLPFUDatabase A suite of R packages for energy conversion chain analysis
+Version: 0.1.9
 Authors@R: 
     c(person(given = "Matthew Kuperus", family = "Heun", email = "[email protected]",
              role = c("aut", "cre"),

diff --git a/NEWS.md b/NEWS.md
@@ -7,6 +7,13 @@ Cite all releases with doi [10.5281/zenodo.10359832](https://doi.org/10.5281/zen
 which always resolves to the latest release.
 
 
+# CLPFUDatabase 0.1.9 (2024-01-04)
+
+* Change order of authors in CITATION.cff to match order of authors on JOSS paper.
+* No new tests.
+    * Still at 17 tests, all passing.
+
+
 # CLPFUDatabase 0.1.8 (2024-01-03) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10456048.svg)](https://doi.org/10.5281/zenodo.10456048)
 
 * Remove a ":" in the title field of the CITATION.cff file.

diff --git a/R/identity.R b/R/identity.R
diff --git a/R/ignore_unused_imports.R b/R/ignore_unused_imports.R
@@ -0,0 +1,19 @@
+# Suppress R CMD check note
+# Namespace in Imports field not imported from: PKG
+#   All declared Imports should be used.
+ignore_unused_imports <- function() {
+  FAOSTAT::get_faostat_bulk
+  IEATools::load_eta_fu_data
+  MKHthemes::xy_theme
+  MWTools::prep_psut
+  PFUAggPipeline::load_aggregation_maps
+  PFUPipeline::load_amw_pfu_data
+  PFUPipelineTools::read_pin_version
+  PFUSetup::get_abs_paths
+  RCLabels::get_nouns
+  Recca::calc_io_mats
+  Rilostat::get_ilostat
+  future.callr::callr
+  matsbyname::sum_byname
+  matsindf::collapse_to_matrices
+}
diff --git a/README.Rmd b/README.Rmd
@@ -21,8 +21,8 @@ knitr::opts_chunk$set(
 
 
 <!-- badges: start -->
-[![R-CMD-check](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml)
 [![CRAN status](https://www.r-pkg.org/badges/version/CLPFUDatabase)](https://CRAN.R-project.org/package=CLPFUDatabase)
+[![R-CMD-check](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml)
 [![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10359832.svg)](https://doi.org/10.5281/zenodo.10359832)
 <!-- badges: end -->

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 <!-- Define some macros for later use -->
 <!-- badges: start -->
 
-[![R-CMD-check](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml)
 [![CRAN
 status](https://www.r-pkg.org/badges/version/CLPFUDatabase)](https://CRAN.R-project.org/package=CLPFUDatabase)
+[![R-CMD-check](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/EnergyEconomyDecoupling/CLPFUDatabase/actions/workflows/R-CMD-check.yaml)
 [![Lifecycle:
 stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10359832.svg)](https://doi.org/10.5281/zenodo.10359832)

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/pkgdown.yml b/docs/pkgdown.yml
@@ -2,7 +2,7 @@ pandoc: 3.1.1
 pkgdown: 2.0.7
 pkgdown_sha: ~
 articles: {}
-last_built: 2024-01-03T17:10Z
+last_built: 2024-01-04T13:43Z
 urls:
   reference: https://energyeconomydecoupling.github.io/CLPFUDatabase/reference
   article: https://energyeconomydecoupling.github.io/CLPFUDatabase/articles

diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/inst/CITATION b/inst/CITATION
@@ -13,11 +13,11 @@ bibentry(
                          role = "aut",
                          comment = c(ORCID = "0000-0002-5964-6776"))),
   year        = "2024",
-  note        = "R package version 0.1.8",
+  note        = "R package version 0.1.9",
   url         = "https://doi.org/10.5281/zenodo.10359832",
   doi         = "10.5281/zenodo.10359832",
   textVersion = paste("Matthew Kuperus Heun, Zeke Marshall, and Emmanuel Aramendia (2024).",
                       "CLPFUDatabase: A suite of R packages for energy conversion chain analysis.",
-                      "R package version 0.1.8.",
+                      "R package version 0.1.9.",
                       "https://doi.org/10.5281/zenodo.10359832")
 )
diff --git a/tests/testthat/test-identity.R b/tests/testthat/test-identity.R
diff --git a/tests/testthat/test-ignore_unused_imports.R b/tests/testthat/test-ignore_unused_imports.R
@@ -0,0 +1,3 @@
+test_that("ignore_unused_imports() works", {
+  expect_no_error(CLPFUDatabase:::ignore_unused_imports())
+})