Merge branch 'issue_192' of github.com:francisbarton/NHSRplotthedots …

…into issue_192

.github/workflows/render-rmarkdown.yml

@@ -0,0 +1,37 @@
+# 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:
+    paths: ['**.Rmd']
+
+name: render-rmarkdown.yaml
+
+permissions: read-all
+
+jobs:
+  render-rmarkdown:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+
+      - uses: r-lib/actions/setup-renv@v2
+
+      - name: Render Rmarkdown files and Commit Results
+        run: |
+          RMD_PATH=($(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep '[.]Rmd$'))
+          Rscript -e 'for (f in commandArgs(TRUE)) if (file.exists(f)) rmarkdown::render(f)' ${RMD_PATH[*]}
+          git config --local user.name "$GITHUB_ACTOR"
+          git config --local user.email "[email protected]"
+          git commit ${RMD_PATH[*]/.Rmd/.md} -m 'Re-build Rmarkdown files' || echo "No changes to commit"
+          git push origin || echo "No changes to commit"

.lintr

@@ -11,4 +11,4 @@ exclusions: list(
 exclude: "# Exclude Linting|#\\s?nolint"
 exclude_start: "# Begin Exclude Linting|#\\s?nolint-start"
 exclude_end: "# End Exclude Linting|#\\s?nolint-end"
-encoding: "ISO-8859-1"
+

DESCRIPTION

@@ -3,24 +3,24 @@ Type: Package
 Title: Draw XmR Charts for NHSE/I 'Making Data Count' Programme
 Version: 0.1.0.9000
 Authors@R: c(
-          person("Christopher", "Reading", ,"[email protected]", c("cre", "aut")),
-          person("Simon", "Wellesley-Miller", ,"[email protected]", "aut"),
-          person("Zoë", "Turner", , "[email protected]", "aut", comment = c(ORCID = "0000-0003-1033-9158")),
-          person("Tom", "Jemmett", ,"[email protected]", "aut", comment = c(ORCID="0000-0002-6943-2990")),
-          person("Tom", "Smith", ,"[email protected]", "aut"),
-          person("Chris", "Mainey", ,"[email protected]", "aut", comment = c(ORCID ="0000-0002-3018-6171")),
-          person("John", "MacKintosh", ,"[email protected]", "aut"),
-          person("Marcos", "Fabietti", ,"[email protected]", "aut"),
+        person("Christopher", "Reading", ,"[email protected]", c("cre", "aut")),
+        person("Simon", "Wellesley-Miller", ,"[email protected]", "aut"),
+        person("Zoë", "Turner", , "[email protected]", "aut", comment = c(ORCID = "0000-0003-1033-9158")),
+        person("Tom", "Jemmett", ,"[email protected]", "aut", comment = c(ORCID="0000-0002-6943-2990")),
+        person("Tom", "Smith", ,"[email protected]", "aut"),
+        person("Chris", "Mainey", ,"[email protected]", "aut", comment = c(ORCID ="0000-0002-3018-6171")),
+        person("John", "MacKintosh", ,"[email protected]", "aut"),
+        person("Marcos", "Fabietti", ,"[email protected]", "aut"),
         person("Fran", "Barton",
             email = "[email protected]",
             role = "aut",
             comment = c(ORCID = "0000-0002-5650-1176")
-        ),
-        person("NHS-R community",
+          ),
+          person("NHS-R community",
             email = "[email protected]",
             role = "cph"
-        )
           )
+        )
 Maintainer: Christopher Reading <[email protected]>
 Description: Provides tools for drawing Statistical Process Control (SPC) charts. This package supports the NHSE/I programme 'Making Data Count', and allows users to draw XmR charts, use change points and apply rules with summary indicators for when rules are breached.
 URL: https://nhs-r-community.github.io/NHSRplotthedots,
@@ -61,4 +61,4 @@ Suggests:
 Depends: R (>= 4.1.0)
 VignetteBuilder: knitr
 Config/testthat/edition: 3
-Language: en-US
+Language: en-GB

tests/testthat/test-ptd_create_ggplot.R

@@ -239,21 +239,6 @@ test_that("it creates a secondary y axis with integer scales", {
   expect_equal(p2$scales$scales[[3]]$secondary.axis$breaks, sec_breaks)
 })
 
-test_that("it sets the y-axis to percentages if percentage_y_axis is TRUE", {
-  set.seed(123)
-
-  m <- mock()
-  stub(ptd_create_ggplot, "scales::label_percent", m)
-
-  d <- data.frame(x = as.Date("2020-01-01") + seq(20L), y = rnorm(20L))
-  s <- ptd_spc(d, "y", "x")
-
-  p1 <- ptd_create_ggplot(s, percentage_y_axis = TRUE)
-  p2 <- ptd_create_ggplot(s, percentage_y_axis = TRUE, y_axis_breaks = 0.2)
-
-  expect_called(m, 2)
-})
-
 test_that("it sets the y-axis if y_axis_breaks is provided", {
   set.seed(123)
   d <- data.frame(x = as.Date("2020-01-01") + seq(20L), y = rnorm(20L))