diff --git a/.github/workflows/test-ci.yaml b/.github/workflows/test-ci.yaml index 881ef26..53699fe 100644 --- a/.github/workflows/test-ci.yaml +++ b/.github/workflows/test-ci.yaml @@ -45,11 +45,12 @@ jobs: - name: Install packages run: | - # Install core packages of all views options(repos = c( CRAN = "https://cloud.r-project.org" )) + library(magrittr) + allviews <- ctv::available.views() packs <- lapply(seq_len(length(allviews)), function(x) { df <- allviews[[x]]$packagelist @@ -62,27 +63,46 @@ jobs: sel_views <- packs[packs$view %in% c("TimeSeries", "Distributions"), ] # rOpenSci packages from r-universe - ropensci <- unlist(jsonlite::read_json("https://ropensci.r-universe.dev/packages")) - ropenscireviewtools <- unlist( - jsonlite::read_json("https://ropenscireviewtools.r-universe.dev/packages") - ) + ropensci <- jsonlite::read_json("https://ropensci.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() + ropenscireviewtools <- jsonlite::read_json("https://ropenscireviewtools.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() + # R-lib packages - rlib <- unlist(jsonlite::read_json("https://r-lib.r-universe.dev/packages")) + rlib <- jsonlite::read_json("https://r-lib.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() # R-forge packages - rforge <- unlist(jsonlite::read_json("https://r-forge.r-universe.dev/packages")) + rforge <- jsonlite::read_json("https://r-forge.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() # R-Studio packages - rstudio <- unlist(jsonlite::read_json("https://rstudio.r-universe.dev/packages")) + rstudio <- jsonlite::read_json("https://rstudio.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() # rspatial packages - rspatial <- unlist(jsonlite::read_json("https://r-spatial.r-universe.dev/packages")) + rspatial <- jsonlite::read_json("https://r-spatial.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() + + # My universes packages - dieghernan <- unlist(jsonlite::read_json("https://dieghernan.r-universe.dev/packages")) - ropenspain <- unlist(jsonlite::read_json("https://ropenspain.r-universe.dev/packages")) - ropengov <- unlist(jsonlite::read_json("https://ropengov.r-universe.dev/packages")) + dieghernan <- jsonlite::read_json("https://dieghernan.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() + ropenspain <- jsonlite::read_json("https://ropenspain.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() + ropengov <- jsonlite::read_json("https://ropengov.r-universe.dev/api/packages") %>% + lapply("[[", "Package") %>% + unlist() # Gather packages all <- sort(unique(c( @@ -90,6 +110,8 @@ jobs: dieghernan, ropenspain, ropengov ))) + + # Check packages not installed yet instpack <- as.character(installed.packages()[, "Package"]) toinstall_init <- setdiff(all, instpack) @@ -105,12 +127,7 @@ jobs: # Check packages available pakav <- as.data.frame(available.packages(repos = getOption("repos"))) toinstall <- toinstall_init[toinstall_init %in% pakav$Package] - message("Installing ", length(toinstall)," packages") - - install.packages(toinstall, - dependencies = TRUE, verbose = TRUE, - quiet = TRUE, type = "binary" - ) + message("Installing ", length(toinstall), " packages") shell: Rscript {0} diff --git a/README.md b/README.md index 72e1cdf..bbff632 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,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 2024-05-30 there are at least 243 repos on GitHub using **cffr**. +As per 2024-06-05 there are at least 242 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 917bfa7..85ee113 100644 --- a/codemeta.json +++ b/codemeta.json @@ -200,7 +200,7 @@ }, "isPartOf": "https://ropensci.org", "keywords": ["attribution", "citation", "credit", "citation-files", "cff", "metadata", "r", "r-package", "citation-file-format", "rstats", "ropensci", "cran"], - "fileSize": "1602.139KB", + "fileSize": "1602.066KB", "citation": [ { "@type": "ScholarlyArticle", diff --git a/tests/testthat/test-cff_create.R b/tests/testthat/test-cff_create.R index 3943528..a4f8093 100644 --- a/tests/testthat/test-cff_create.R +++ b/tests/testthat/test-cff_create.R @@ -424,9 +424,7 @@ test_that("Search package on r-universe", { # Get packages from my r-universe - dhh <- unlist(jsonlite::read_json( - "https://dieghernan.r-universe.dev/packages" - ))[1] + dhh <- "tidyterra" newpack <- desc::desc(tmp)