Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see! Please copy and paste both your code and the error message you received.
placeholder: Tell us what you see! Please copy and paste both your code and the error message you received. Please **do not** attach screenshots of your code or error messages. We need to be able to copy and paste your code and error messages to help you.
validations:
required: true
- type: textarea
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/r-universe-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Test R-universe

on:
pull_request:
branches-ignore:
- ghpages

jobs:
build:
name: R-universe testing
uses: r-universe-org/workflows/.github/workflows/build.yml@v3
with:
universe: ${{ github.repository_owner }}
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "checklist: A Thorough and Strict Set of Checks for R Packages and Source Code",
"version": "0.6.0",
"version": "0.6.1",
"license": "GPL-3.0",
"upload_type": "software",
"description": "<p>An opinionated set of rules for R packages and R source code projects.<\/p>",
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ identifiers:
value: 10.5281/zenodo.4028303
- type: url
value: https://inbo.github.io/checklist/
version: 0.6.0
version: 0.6.1
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: checklist
Title: A Thorough and Strict Set of Checks for R Packages and Source Code
Version: 0.6.0
Version: 0.6.1
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)")),
Expand All @@ -22,8 +22,9 @@ Depends:
R (>= 4.1.0)
Imports:
assertthat,
citeme (>= 0.1.2),
citeme (>= 0.1.4),
cli,
cyclocomp,
desc,
devtools (> 2.4.0),
gert,
Expand All @@ -41,7 +42,6 @@ Suggests:
bookdown,
covr,
curl,
cyclocomp,
knitr,
mockery,
pak,
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ importFrom(cli,cli_h1)
importFrom(cli,cli_text)
importFrom(cli,col_green)
importFrom(cli,col_red)
importFrom(cyclocomp,cyclocomp)
importFrom(desc,desc)
importFrom(desc,description)
importFrom(devtools,build_readme)
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# checklist 0.6.1

* Improve bug report template
* Correct pass the organisation when creating a package skeleton (#197)

# checklist 0.6.0

## Breaking changes
Expand Down
4 changes: 1 addition & 3 deletions R/check_lintr.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@
#' @inheritParams rcmdcheck::rcmdcheck
#' @export
#' @importFrom assertthat assert_that is.flag noNA
#' @importFrom cyclocomp cyclocomp
#' @importFrom gert git_submodule_list
#' @importFrom lintr lint_dir lint_package
#' @importFrom withr defer
#' @family both
check_lintr <- function(x = ".", quiet = FALSE) {
assert_that(is.flag(quiet), noNA(quiet))
stopifnot(
"Please install the `cyclocomp` package" = requireNamespace("cyclocomp")
)
x <- read_checklist(x = x)
options(lintr.linter_file = select_lintr_file(x$get_path))
old_lint_option <- getOption("lintr.rstudio_source_markers", TRUE)
Expand Down
11 changes: 9 additions & 2 deletions R/package_maintainer.R
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
#' @importFrom citeme individual2person
package_maintainer <- function(org, lang) {
message("Please select the maintainer")
maintainer <- individual2person(role = c("aut", "cre"), lang = lang)
maintainer <- individual2person(
role = c("aut", "cre"),
lang = lang,
org = org
)
while (isTRUE(ask_yes_no("Add another author?", default = FALSE))) {
maintainer <- c(maintainer, individual2person(role = "aut", lang = lang))
maintainer <- c(
maintainer,
individual2person(role = "aut", lang = lang, org = org)
)
}
info <- ask_rightsholder_funder(org = org, type = "rightsholder")
selected_org <- info$selection
Expand Down
4 changes: 2 additions & 2 deletions R/project_maintainer.R
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#' @importFrom citeme ask_yes_no individual2badge select_individual
project_maintainer <- function(org, lang) {
message("Please select the corresponding author")
select_individual(lang = lang) |>
select_individual(lang = lang, org = org) |>
individual2badge(role = c("aut", "cre")) -> author
while (isTRUE(ask_yes_no("add another author?", default = FALSE))) {
select_individual(lang = lang) |>
select_individual(lang = lang, org = org) |>
individual2badge(role = "aut") -> extra
attr(author, "footnote") |>
c(attr(extra, "footnote")) -> footnote
Expand Down
4 changes: 2 additions & 2 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ citHeader("To cite `checklist` in publications please use:")
# begin checklist entry
bibentry(
bibtype = "Manual",
title = "checklist: A Thorough and Strict Set of Checks for R Packages and Source Code. Version 0.6.0",
title = "checklist: A Thorough and Strict Set of Checks for R Packages and Source Code. Version 0.6.1",
author = c(person(given = "Thierry", family = "Onkelinx")),
year = 2026,
url = "https://inbo.github.io/checklist/",
abstract = "An opinionated set of rules for R packages and R source code projects.",
textVersion = "Onkelinx, Thierry (2026) checklist: A Thorough and Strict Set of Checks for R Packages and Source Code. Version 0.6.0. https://inbo.github.io/checklist/",
textVersion = "Onkelinx, Thierry (2026) checklist: A Thorough and Strict Set of Checks for R Packages and Source Code. Version 0.6.1. https://inbo.github.io/checklist/",
keywords = "quality control; documentation; publication; inbo_version",
doi = "10.5281/zenodo.4028303",
)
Expand Down
2 changes: 2 additions & 0 deletions tests/testthat/test_c_create_package.R
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ test_that("create_package() works", {
unlist(x$.__enclos_env__$private$allowed_notes),
sep = "\n"
)
# skip further tests on R-universe
skip_if(Sys.getenv("MY_UNIVERSE") != "")
expect_false(identical(
old_checklist$.__enclos_env__$private$allowed_notes,
x$.__enclos_env__$private$allowed_notes
Expand Down
Loading