diff --git a/CITATION.cff b/CITATION.cff index a4e3738..0cad311 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "cffr" in publications use:' type: software license: GPL-3.0-or-later title: 'cffr: Generate Citation File Format (''cff'') Metadata for R Packages' -version: 1.1.1.9001 +version: 1.2.0 doi: 10.21105/joss.03900 identifiers: - type: doi @@ -59,6 +59,7 @@ keywords: - r-package - ropensci - rstats +- r-cran references: - type: generic title: Citation File Format diff --git a/DESCRIPTION b/DESCRIPTION index bd83ec7..02d5ca0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: cffr Title: Generate Citation File Format ('cff') Metadata for R Packages -Version: 1.1.1.9001 +Version: 1.2.0 Authors@R: c( person("Diego", "Hernangómez", , "diego.hernangomezherrero@gmail.com", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0001-8457-4658")), @@ -42,4 +42,5 @@ Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.2 X-schema.org-isPartOf: https://ropensci.org X-schema.org-keywords: attribution, citation, credit, citation-files, cff, - metadata, citation-file-format, cran, r, r-package, ropensci, rstats + metadata, citation-file-format, cran, r, r-package, ropensci, rstats, + r-cran diff --git a/NEWS.md b/NEWS.md index 5494749..61a6fa2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# cffr (development version) +# cffr 1.2.0 - New parameter `r_citation` in `cff_write()`. When it is set to `TRUE` a **R** citation file (`inst/CITATION`) would be generated/updated with the @@ -6,6 +6,8 @@ created**, for more control use `cff_write_citation()` (#79). - `repository-code` now also recognizes [Codeberg](https://codeberg.org/) as a valid repository (#88). +- `repository-code` recognizes repositories regardless of casing. It is still + advised to use lower caps as a good practice for **R** developers. # cffr 1.1.1 diff --git a/R/utils-cff_read.R b/R/utils-cff_read.R index 43a834e..530831f 100644 --- a/R/utils-cff_read.R +++ b/R/utils-cff_read.R @@ -228,7 +228,7 @@ get_desc_urls <- function(pkg) { ), collapse = "|") # Extract repo url - repo_line <- grep(domains, allurls)[1] + repo_line <- grep(domains, allurls, ignore.case = TRUE)[1] repository_code <- clean_str(allurls[repo_line][1]) diff --git a/README.md b/README.md index f112681..5b5e051 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ file and the `CITATION` file (if present) of your package. Note that **cffr** works best if your package pass `R CMD check/devtools::check()`. -As per 2025-01-22 there are at least 362 repos on GitHub using **cffr**. +As per 2025-01-25 there are at least 390 repos on GitHub using **cffr**. [Check them out here](https://github.com/search?q=cffr%20path%3A**%2FCITATION.cff&type=code). diff --git a/codemeta.json b/codemeta.json index 3f0171a..8a2ad83 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,7 +8,7 @@ "codeRepository": "https://github.com/ropensci/cffr", "issueTracker": "https://github.com/ropensci/cffr/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "1.1.1.9001", + "version": "1.2.0", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -199,8 +199,8 @@ "SystemRequirements": null }, "isPartOf": "https://ropensci.org", - "keywords": ["attribution", "citation", "credit", "citation-files", "cff", "metadata", "citation-file-format", "cran", "r", "r-package", "ropensci", "rstats"], - "fileSize": "1627.804KB", + "keywords": ["attribution", "citation", "credit", "citation-files", "cff", "metadata", "citation-file-format", "cran", "r", "r-package", "ropensci", "rstats", "r-cran"], + "fileSize": "1632.421KB", "citation": [ { "@type": "ScholarlyArticle", diff --git a/inst/schemaorg.json b/inst/schemaorg.json index 2a0dd79..ee05ba8 100644 --- a/inst/schemaorg.json +++ b/inst/schemaorg.json @@ -27,5 +27,5 @@ "url": "https://cran.r-project.org" }, "runtimePlatform": "R version 4.4.2 (2024-10-31 ucrt)", - "version": "1.1.1.9001" + "version": "1.2.0" } diff --git a/revdep/README.md b/revdep/README.md index b783b80..f047d1e 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -1,32 +1,33 @@ # Platform -|field |value | -|:--------|:------------------------------------------------------| -|version |R version 4.4.2 (2024-10-31) | -|os |Ubuntu 24.04.1 LTS | -|system |x86_64, linux-gnu | -|ui |X11 | -|language |(EN) | -|collate |C.UTF-8 | -|ctype |C.UTF-8 | -|tz |UTC | -|date |2025-01-17 | -|pandoc |3.1.11 @ /opt/hostedtoolcache/pandoc/3.1.11/x64/pandoc | +|field |value | +|:--------|:----------------------------------------| +|version |R version 4.4.2 (2024-10-31 ucrt) | +|os |Windows 11 x64 (build 26100) | +|system |x86_64, mingw32 | +|ui |RStudio | +|language |(EN) | +|collate |Spanish_Spain.utf8 | +|ctype |Spanish_Spain.utf8 | +|tz |Europe/Madrid | +|date |2025-01-25 | +|rstudio |2024.12.0+467 Kousa Dogwood (desktop) | +|pandoc |3.1.12.2 @ C:\PROGRA~1\Pandoc\pandoc.exe | # Dependencies -|package |old |new |Δ | -|:------------|:------|:----------|:--| -|cffr |1.1.1 |1.1.1.9000 |* | -|cli |3.6.3 |3.6.3 | | -|curl |6.1.0 |6.1.0 | | -|desc |1.4.3 |1.4.3 | | -|jsonlite |1.8.9 |1.8.9 | | -|jsonvalidate |1.3.2 |1.3.2 | | -|R6 |2.5.1 |2.5.1 | | -|Rcpp |1.0.14 |1.0.14 | | -|V8 |6.0.0 |6.0.0 | | -|yaml |2.3.10 |2.3.10 | | +|package |old |new |Δ | +|:------------|:------|:------|:--| +|cffr |1.1.1 |1.2.0 |* | +|cli |3.6.3 |3.6.3 | | +|curl |6.2.0 |6.2.0 | | +|desc |1.4.3 |1.4.3 | | +|jsonlite |1.8.9 |1.8.9 | | +|jsonvalidate |1.3.2 |1.3.2 | | +|R6 |2.5.1 |2.5.1 | | +|Rcpp |1.0.14 |1.0.14 | | +|V8 |6.0.0 |6.0.0 | | +|yaml |2.3.10 |2.3.10 | | # Revdeps diff --git a/revdep/cran.md b/revdep/cran.md index bfbf120..fdf1792 100644 --- a/revdep/cran.md +++ b/revdep/cran.md @@ -1,6 +1,6 @@ ## revdepcheck results -We checked 5 reverse dependencies (0 from CRAN + 5 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. +We checked 5 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. * We saw 0 new problems * We failed to check 0 packages diff --git a/tests/testthat/_snaps/cff_read.md b/tests/testthat/_snaps/cff_read.md index 3d8ccee..d7419d3 100644 --- a/tests/testthat/_snaps/cff_read.md +++ b/tests/testthat/_snaps/cff_read.md @@ -125,6 +125,7 @@ - family-names: Paul given-names: Michaela repository: https://CRAN.R-project.org/package=surveillance + repository-code: https://surveillance.R-Forge.R-project.org/ url: https://surveillance.R-Forge.R-project.org/ date-released: '2021-03-30' contact: diff --git a/tests/testthat/_snaps/utils-create.md b/tests/testthat/_snaps/utils-create.md index c2b9e2a..3770ad7 100644 --- a/tests/testthat/_snaps/utils-create.md +++ b/tests/testthat/_snaps/utils-create.md @@ -898,6 +898,7 @@ overview of the implemented space-time modeling frameworks for epidemic phenomena is given by Meyer et al. (2017) . repository: https://CRAN.R-project.org/package=surveillance + repository-code: https://surveillance.R-Forge.R-project.org/ url: https://surveillance.R-Forge.R-project.org/ date-released: '2021-03-30' contact: