Merge pull request #16 from inbo/0.0.3

0.0.4

Author: ThierryO

.github/workflows/check_on_branch.yml

@@ -0,0 +1,30 @@
+on:
+  push:
+    branches-ignore:
+      - ghpages
+
+name: "check package with checklist"
+
+jobs:
+  check-package:
+    runs-on: ubuntu-24.04
+    name: check-package
+    env:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      RSPM: "https://packagemanager.rstudio.com/cran/__linux__/noble/latest"
+    permissions:
+      contents: read
+    steps:
+      - name: "Check package with checklist"
+        uses: inbo/actions/check_pkg@composite
+  deploy-pages:
+    name: deploy-gh-pages
+    runs-on: ubuntu-24.04
+    needs: check-package
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    permissions:
+      contents: write
+    steps:
+      - name: "Tag and deploy gh-pages"
+        uses: inbo/actions/check_deploy@composite

.github/workflows/check_on_main.yml

@@ -1,12 +1,13 @@
 {
   "title": "flandersqmd: Auxiliary Function for the Flandersqmd Quarto Extensions",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "license": "GPL-3.0",
   "upload_type": "software",
   "description": "<p>Prepare new documents using the Flandersqmd extensions.<\/p>",
   "keywords": [
     "corporate identity",
-    "quarto"
+    "quarto",
+    "inbo_version"
   ],
   "access_right": "open",
   "language": "eng",
@@ -33,5 +34,6 @@
     {
       "identifier": "inbo"
     }
-  ]
+  ],
+  "publisher": "Research Institute for Nature and Forest (INBO)"
 }

.github/workflows/check_package.yml

@@ -9,6 +9,7 @@ authors:
 keywords:
 - corporate identity
 - quarto
+- inbo_version
 contact:
 - given-names: Thierry
   family-names: Onkelinx
@@ -22,4 +23,4 @@ abstract: "Prepare new documents using the Flandersqmd extensions."
 identifiers:
 - type: url
   value: https://inbo.github.io/flandersqmd/
-version: 0.0.3
+version: 0.0.4

.zenodo.json

@@ -1,10 +1,10 @@
 Package: flandersqmd
 Title: Auxiliary Function for the Flandersqmd Quarto Extensions
-Version: 0.0.3
+Version: 0.0.4
 Authors@R: c(
     person("Thierry", "Onkelinx", , "thierry.onkelinx@inbo.be", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-8804-4216", affiliation = "Research Institute for Nature and Forest (INBO)")),
-    person("Research Institute for Nature and Forest (INBO)", , , "info@inbo.be", role = c("cph", "fnd"),
+    person("Research Institute for Nature and Forest (INBO)", , , "info@inbo.be", role = c("cph", "fnd", "pbl"),
            comment = c(ROR = "00j54wy13"))
   )
 Description: Prepare new documents using the Flandersqmd extensions.
@@ -16,17 +16,19 @@ Depends:
 Imports:
     assertthat,
     checklist (>= 0.5.3),
+    citeme,
     fs,
     gert,
+    gh,
     pdftools,
     quarto,
     yaml
 Suggests:
     rstudioapi
 Additional_repositories: https://inbo.r-universe.dev
-Config/checklist/communities: inbo
-Config/checklist/keywords: corporate identity; quarto
+Config/citeme/communities: inbo
+Config/citeme/keywords: corporate identity; quarto; inbo_version
+Config/roxygen2/version: 8.0.0
 Encoding: UTF-8
 Language: en-GB
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.3

CITATION.cff

@@ -34,6 +34,7 @@ ENV QUARTO_VERSION=1.8.27
 RUN  curl -L -O https://github.com/quarto-dev/quarto-cli/releases/download/v$QUARTO_VERSION/quarto-$QUARTO_VERSION-linux-amd64.deb \
   && dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb \
   && quarto install tinytex --update-path \
+  && tlmgr update --self \
   && tlmgr install datetime2 emptypage etoolbox fancyhdr fontawesome5 footmisc geometry hyphen-dutch hyphen-french hyphen-german hyperref lastpage multirow parskip pdfpages titlesec tocloft url
 
 ## Install fonts

DESCRIPTION

@@ -10,23 +10,25 @@ export(add_index)
 export(add_recommendations)
 export(author2yaml)
 export(create_report)
+export(get_branches_tags)
 export(inbo_website)
 export(insert_missing_metadata)
 export(post_render)
 importFrom(assertthat,assert_that)
 importFrom(assertthat,has_name)
+importFrom(assertthat,is.count)
 importFrom(assertthat,is.flag)
+importFrom(assertthat,is.number)
 importFrom(assertthat,is.string)
 importFrom(assertthat,noNA)
 importFrom(checklist,ask_rightsholder_funder)
-importFrom(checklist,ask_yes_no)
-importFrom(checklist,author2df)
-importFrom(checklist,citation_meta)
-importFrom(checklist,get_branches_tags)
-importFrom(checklist,inbo_org_list)
-importFrom(checklist,menu_first)
 importFrom(checklist,read_checklist)
-importFrom(checklist,use_author)
+importFrom(citeme,ask_yes_no)
+importFrom(citeme,citation_meta)
+importFrom(citeme,inbo_org_list)
+importFrom(citeme,individual2df)
+importFrom(citeme,menu_first)
+importFrom(citeme,select_individual)
 importFrom(fs,dir_create)
 importFrom(fs,dir_delete)
 importFrom(fs,dir_ls)
@@ -38,6 +40,7 @@ importFrom(fs,is_file)
 importFrom(fs,path)
 importFrom(fs,path_rel)
 importFrom(gert,git_find)
+importFrom(gh,gh)
 importFrom(pdftools,pdf_convert)
 importFrom(pdftools,pdf_subset)
 importFrom(quarto,quarto_add_extension)

Dockerfile

@@ -1,3 +1,7 @@
+# flandersqmd 0.0.4
+
+* Use `citeme` instead of `checklist` for citation management.
+
 # flandersqmd 0.0.3
 
 * Create Docker for rendering the examples.

NAMESPACE

@@ -6,6 +6,7 @@
 #' @return The path to the `_quarto.yml` file.
 #' @export
 #' @importFrom assertthat assert_that is.flag is.string has_name noNA
+#' @importFrom citeme select_individual
 #' @importFrom fs is_dir is_file path
 #' @importFrom yaml read_yaml
 add_author <- function(report_path = ".", reviewer = FALSE) {
@@ -23,7 +24,7 @@ add_author <- function(report_path = ".", reviewer = FALSE) {
     "No `flandersqmd` entry in `_quarto.yml`" = has_name(yaml, "flandersqmd"),
     "No `lang` entry in `_quarto.yml`" = has_name(yaml, "lang")
   )
-  use_author(lang = yaml$lang) |>
+  select_individual(lang = yaml$lang) |>
     author2list() -> extra
   if (reviewer) {
     yaml$flandersqmd$reviewer <- c(yaml$flandersqmd$reviewer, list(extra))