Merge pull request #5 from pepijn-devries/work-in-progress

Work in progress

.github/workflows/R-CMD-check.yaml

@@ -0,0 +1,34 @@
+# 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]
+
+name: R-CMD-check
+
+permissions: read-all
+
+jobs:
+  R-CMD-check:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

DESCRIPTION

@@ -1,7 +1,6 @@
 Package: ggfields
 Title: Add Vector Field Layers to Ggplots
-Version: 0.0.6
-Date: 2024-02-26
+Version: 0.0.6.0001
 Authors@R: c(person("Pepijn", "de Vries", role = c("aut", "cre"),
     email = "[email protected]",
     comment = c(ORCID = "0000-0002-7961-6646")))

NEWS.md

@@ -1,10 +1,16 @@
-ggfields v0.0.6 (Release date: 2024-02-26)
+ggfields v0.0.6.0001
+-------------
+
+ * Fixed test
+ * Added test coverage workflow
+
+ggfields v0.0.6
 -------------
 
  * Some tweaks to `pkgdown` website
  * Fixes to pass CRAN checks
 
-ggfields v0.0.3 (Release date: 2024-02-01)
+ggfields v0.0.3
 -------------
 
   * Initial release

R/scale.r

@@ -32,8 +32,8 @@
 #' @export
 scale_radius_continuous <- function(..., range = c(1e-8, 1)) {
   ggplot2::continuous_scale(
-    "radius", "radius_c",
-    scales::rescale_pal(range = range),
+    "radius",
+    palette = scales::rescale_pal(range = range),
     rescaler = function(x, to = range, from = c(0, max(x, na.rm = TRUE))) {
       x <- as.numeric(x)
       if (any(stats::na.omit(x) < 0)) rlang::abort(c(
@@ -50,13 +50,13 @@ scale_radius_continuous <- function(..., range = c(1e-8, 1)) {
 #' @rdname scale
 #' @export
 scale_radius_binned <- function(..., range = c(1e-8, 1)) {
-  ggplot2::binned_scale("radius", "radius_b", scales::rescale_pal(range), ...)
+  ggplot2::binned_scale("radius", palette = scales::rescale_pal(range), ...)
 }
 
 #' @name scale_radius_discrete
 #' @rdname scale
 #' @export
 scale_radius_discrete <- function(..., range = c(1e-8, 1)) {
-  ggplot2::discrete_scale("radius", "radius_d", function(n)
+  ggplot2::discrete_scale("radius", palette = function(n)
     seq(range[[1]], range[[2]], length.out = n), ...)
 }

README.Rmd

@@ -16,6 +16,14 @@ knitr::opts_chunk$set(
 
 ## Overview
 
+<!-- badges: start -->
+[![R-CMD-check](https://github.com/pepijn-devries/ggfields/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/pepijn-devries/ggfields/actions/workflows/R-CMD-check.yaml)
+![cranlogs](https://cranlogs.r-pkg.org/badges/ggfields)
+[![version](https://www.r-pkg.org/badges/version/ggfields)](https://CRAN.R-project.org/package=ggfields)
+[![cran checks](https://badges.cranchecks.info/worst/ggfields.svg)](https://cran.r-project.org/web/checks/check_results_ggfields.html)
+[![csquares status badge](https://pepijn-devries.r-universe.dev/badges/ggfields)](https://pepijn-devries.r-universe.dev/ggfields)
+<!-- badges: end -->
+
 <img src="man/figures/logo.png" align="right" alt = "logo" class = "pkgdown-hide" />
 
 Add vector field layers to your `ggplot2::ggplot()`. Although it has similarities

README.md

@@ -3,6 +3,17 @@
 
 ## Overview
 
+<!-- badges: start -->
+
+[![R-CMD-check](https://github.com/pepijn-devries/ggfields/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/pepijn-devries/ggfields/actions/workflows/R-CMD-check.yaml)
+![cranlogs](https://cranlogs.r-pkg.org/badges/ggfields)
+[![version](https://www.r-pkg.org/badges/version/ggfields)](https://CRAN.R-project.org/package=ggfields)
+[![cran
+checks](https://badges.cranchecks.info/worst/ggfields.svg)](https://cran.r-project.org/web/checks/check_results_ggfields.html)
+[![csquares status
+badge](https://pepijn-devries.r-universe.dev/badges/ggfields)](https://pepijn-devries.r-universe.dev/ggfields)
+<!-- badges: end -->
+
 <img src="man/figures/logo.png" align="right" alt = "logo" class = "pkgdown-hide" />
 
 Add vector field layers to your `ggplot2::ggplot()`. Although it has
@@ -36,6 +47,7 @@ The example below shows how seawater current data can be added to a map:
 
 ``` r
 library(ggplot2)
+#> Warning: package 'ggplot2' was built under R version 4.3.3
 library(ggfields)
 library(ggspatial) ## For annotating with Open Street Map
 ```

tests/testthat/test_dev.r

@@ -1,5 +1,7 @@
 test_that("Source code should not have things on TODO list", {
   expect_false({
+    skip_if(length(unclass(packageVersion("ggfields"))[[1]]) > 3,
+            "Skipping during development")
     files_to_check <-
       list.files(system.file(package = "ggfields"),
                  pattern = "[.]r$|NEWS|DESCRIPTION|README", recursive = TRUE, full.names = TRUE)