Skip to content

Commit

Permalink
Merge branch 'main' into 20-pass-credentials-via-sys-env
Browse files Browse the repository at this point in the history
  • Loading branch information
PietrH committed Mar 29, 2024
2 parents 1fb4669 + 53f34a0 commit 1c8b705
Show file tree
Hide file tree
Showing 14 changed files with 574 additions and 44 deletions.
5 changes: 5 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@
^\.Rproj\.user$
^LICENSE\.md$
^\.github$
^_pkgdown\.yml$
^docs$
^pkgdown$
^CITATION\.cff$
^codemeta\.json$
48 changes: 48 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
58 changes: 58 additions & 0 deletions .github/workflows/update-citation-cff.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# The action runs when:
# - A new release is published
# - The DESCRIPTION or inst/CITATION are modified
# - Can be run manually
# For customizing the triggers, visit https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
on:
release:
types: [published]
push:
branches: [master, main]
paths:
- DESCRIPTION
- inst/CITATION
workflow_dispatch:

name: Update CITATION.cff

jobs:
update-citation-cff:
runs-on: macos-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: r-lib/actions/setup-r@v2
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
any::cffr
any::V8
- name: Update CITATION.cff
run: |
library(cffr)
# Customize with your own code
# See https://docs.ropensci.org/cffr/articles/cffr.html
# Write your own keys
mykeys <- list()
# Create your CITATION.cff file
cff_write(keys = mykeys)
shell: Rscript {0}

- name: Commit results
run: |
git config --local user.name "github-actions[bot]"
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add CITATION.cff
git commit -m 'Update CITATION.cff' || echo "No changes to commit"
git push origin || echo "No changes to commit"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
.httr-oauth
.DS_Store
.quarto
docs
178 changes: 178 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
# -----------------------------------------------------------
# CITATION file created with {cffr} R package, v0.5.0
# See also: https://docs.ropensci.org/cffr/
# -----------------------------------------------------------

cff-version: 1.2.0
message: 'To cite package "iassetR" in publications use:'
type: software
license: MIT
title: 'iassetR: Use the iAsset API in R'
version: 0.0.0.9000
abstract: This package is an interface to the REST api of iAsset.
authors:
- family-names: Huybrechts
given-names: Pieter
email: [email protected]
orcid: https://orcid.org/0000-0002-6658-6062
- family-names: Devisscher
given-names: Sander
email: [email protected]
orcid: https://orcid.org/0000-0003-2015-5731
url: https://inbo.github.io/iassetR/
contact:
- family-names: Huybrechts
given-names: Pieter
email: [email protected]
orcid: https://orcid.org/0000-0002-6658-6062
references:
- type: software
title: askpass
abstract: 'askpass: Password Entry Utilities for R, Git, and SSH'
notes: Imports
url: https://github.com/r-lib/askpass
repository: https://CRAN.R-project.org/package=askpass
authors:
- family-names: Ooms
given-names: Jeroen
email: [email protected]
orcid: https://orcid.org/0000-0002-4035-0289
year: '2024'
- type: software
title: assertthat
abstract: 'assertthat: Easy Pre and Post Assertions'
notes: Imports
repository: https://CRAN.R-project.org/package=assertthat
authors:
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2024'
- type: software
title: dplyr
abstract: 'dplyr: A Grammar of Data Manipulation'
notes: Imports
url: https://dplyr.tidyverse.org
repository: https://CRAN.R-project.org/package=dplyr
authors:
- family-names: Wickham
given-names: Hadley
email: [email protected]
orcid: https://orcid.org/0000-0003-4757-117X
- family-names: François
given-names: Romain
orcid: https://orcid.org/0000-0002-2444-4226
- family-names: Henry
given-names: Lionel
- family-names: Müller
given-names: Kirill
orcid: https://orcid.org/0000-0002-1416-3412
- family-names: Vaughan
given-names: Davis
email: [email protected]
orcid: https://orcid.org/0000-0003-4777-038X
year: '2024'
- type: software
title: glue
abstract: 'glue: Interpreted String Literals'
notes: Imports
url: https://glue.tidyverse.org/
repository: https://CRAN.R-project.org/package=glue
authors:
- family-names: Hester
given-names: Jim
orcid: https://orcid.org/0000-0002-2739-7082
- family-names: Bryan
given-names: Jennifer
email: [email protected]
orcid: https://orcid.org/0000-0002-6983-2759
year: '2024'
- type: software
title: httr2
abstract: 'httr2: Perform HTTP Requests and Process the Responses'
notes: Imports
url: https://httr2.r-lib.org
repository: https://CRAN.R-project.org/package=httr2
authors:
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2024'
- type: software
title: janitor
abstract: 'janitor: Simple Tools for Examining and Cleaning Dirty Data'
notes: Imports
url: https://sfirke.github.io/janitor/
repository: https://CRAN.R-project.org/package=janitor
authors:
- family-names: Firke
given-names: Sam
email: [email protected]
year: '2024'
- type: software
title: magrittr
abstract: 'magrittr: A Forward-Pipe Operator for R'
notes: Imports
url: https://magrittr.tidyverse.org
repository: https://CRAN.R-project.org/package=magrittr
authors:
- family-names: Bache
given-names: Stefan Milton
email: [email protected]
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2024'
- type: software
title: openssl
abstract: 'openssl: Toolkit for Encryption, Signatures and Certificates Based on
OpenSSL'
notes: Imports
url: https://jeroen.r-universe.dev/openssl
repository: https://CRAN.R-project.org/package=openssl
authors:
- family-names: Ooms
given-names: Jeroen
email: [email protected]
orcid: https://orcid.org/0000-0002-4035-0289
year: '2024'
- type: software
title: purrr
abstract: 'purrr: Functional Programming Tools'
notes: Imports
url: https://purrr.tidyverse.org/
repository: https://CRAN.R-project.org/package=purrr
authors:
- family-names: Wickham
given-names: Hadley
email: [email protected]
orcid: https://orcid.org/0000-0003-4757-117X
- family-names: Henry
given-names: Lionel
email: [email protected]
year: '2024'
- type: software
title: rlang
abstract: 'rlang: Functions for Base Types and Core R and ''Tidyverse'' Features'
notes: Imports
url: https://rlang.r-lib.org
repository: https://CRAN.R-project.org/package=rlang
authors:
- family-names: Henry
given-names: Lionel
email: [email protected]
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2024'
- type: software
title: stringr
abstract: 'stringr: Simple, Consistent Wrappers for Common String Operations'
notes: Imports
url: https://stringr.tidyverse.org
repository: https://CRAN.R-project.org/package=stringr
authors:
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2024'
20 changes: 10 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@ Package: iassetR
Title: Use the iAsset API in R
Version: 0.0.0.9000
Authors@R: c(
person("Pieter", "Huybrechts", email = "[email protected]",
role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-6658-6062")),
person("Sander", "Devisscher", email = "[email protected]",
role = c("aut"),
comment = c(ORCID = "0000-0003-2015-5731"))
)
person("Pieter", "Huybrechts", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0002-6658-6062")),
person("Sander", "Devisscher", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-2015-5731"))
)
Description: This package is an interface to the REST api of iAsset.
License: MIT + file LICENSE
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
URL: https://inbo.github.io/iassetR/
Imports:
askpass,
assertthat,
Expand All @@ -27,3 +23,7 @@ Imports:
purrr,
rlang,
stringr
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
BugReports: https://github.com/inbo/iassetR/issues
3 changes: 2 additions & 1 deletion R/get_fields.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
#' @export
#'
#' @examples \dontrun{get_fields("Vespa-Watch")}
get_fields <- function(name = "Vespa-Watch", access_token = get_access_token(quiet = TRUE)) {
get_fields <- function(name = "Vespa-Watch",
access_token = get_access_token(quiet = TRUE)) {
# check input params
assertthat::assert_that(assertthat::is.string(access_token))
assertthat::assert_that(assertthat::is.string(name))
Expand Down
Loading

0 comments on commit 1c8b705

Please sign in to comment.