From e0266ba32de4a6a62cacf582dbe90b203661fe18 Mon Sep 17 00:00:00 2001 From: alicebyers5 Date: Mon, 4 Mar 2024 14:09:54 +0000 Subject: [PATCH 1/3] Edit roxygen version and ignore Meta folder --- .Rbuildignore | 1 + .gitignore | 1 + DESCRIPTION | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.Rbuildignore b/.Rbuildignore index c140137..a2bc7d4 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -9,3 +9,4 @@ ^docs$ ^pkgdown$ ^doc$ +^Meta$ diff --git a/.gitignore b/.gitignore index 1ed2045..130a84f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ docs inst/doc /doc/ +/Meta/ diff --git a/DESCRIPTION b/DESCRIPTION index a2294db..89e468d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -13,7 +13,7 @@ URL: BugReports: https://github.com/ScotGovAnalysis/sgplot/issues Encoding: UTF-8 LazyData: true -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Depends: R (>= 2.10) Imports: From 2ff05163aff96bc13954dfe74ad3da04835b66de Mon Sep 17 00:00:00 2001 From: alicebyers5 Date: Fri, 15 Mar 2024 15:08:44 +0000 Subject: [PATCH 2/3] Fix typo in contributing link --- vignettes/colours.Rmd | 2 +- vignettes/cookbook/_colour-palettes.Rmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vignettes/colours.Rmd b/vignettes/colours.Rmd index 97145bc..a470550 100644 --- a/vignettes/colours.Rmd +++ b/vignettes/colours.Rmd @@ -170,7 +170,7 @@ If so, this should be carefully considered to ensure it meets accessibility requ The Analysis Function guidance outlines [appropriate steps for choosing your own accessibile colour palette](https://analysisfunction.civilservice.gov.uk/policy-store/data-visualisation-colours-in-charts/#section-9) and should be used. An example of how to use an alternative colour palette is provided in the [cookbook](https://scotgovanalysis.github.io/sgplot/articles/cookbook.html#using-your-own-colour-palette). -However, if you use a different palette regularly and feel it would be useful for this to be added to sgplot, please make a suggestion as per the [contributing guidance](https://scotgovanalysis.github.io/sgplot/CONTRIBTUING.html). +However, if you use a different palette regularly and feel it would be useful for this to be added to sgplot, please make a suggestion as per the [contributing guidance](https://scotgovanalysis.github.io/sgplot/CONTRIBUTING.html). ## Viewing Palettes in R diff --git a/vignettes/cookbook/_colour-palettes.Rmd b/vignettes/cookbook/_colour-palettes.Rmd index 718e794..24ec256 100644 --- a/vignettes/cookbook/_colour-palettes.Rmd +++ b/vignettes/cookbook/_colour-palettes.Rmd @@ -125,4 +125,4 @@ gapminder |> #### Adding a new colour palette to sgplot -If you use a different palette regularly and feel it would be useful for this to be added to sgplot, please make a suggestion as per the [contributing guidance](https://scotgovanalysis.github.io/sgplot/CONTRIBTUING.html). +If you use a different palette regularly and feel it would be useful for this to be added to sgplot, please make a suggestion as per the [contributing guidance](https://scotgovanalysis.github.io/sgplot/CONTRIBUTING.html). From ebeeb08ccb233ab5b6c332c4ace9da0f3a040c36 Mon Sep 17 00:00:00 2001 From: alicebyers5 Date: Fri, 15 Mar 2024 18:18:39 +0000 Subject: [PATCH 3/3] Update package version --- DESCRIPTION | 2 +- NEWS.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 89e468d..e9712bb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: sgplot Title: Graphic Styles and Colours for Scottish Government Plots -Version: 0.2.1 +Version: 0.2.2 Authors@R: c( person("Scottish Government", , , "statistics.enquiries@gov.scot", role = c("cph", "fnd")), person("Alice", "Byers", , "alice.byers@gov.scot", c("aut", "cre")) diff --git a/NEWS.md b/NEWS.md index d635289..01e1c6c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# sgplot 0.2.2 + +* Fix links to contributing guidance in vignettes + +* Update required `roxygen` version + # sgplot 0.2.1 * Fix issue where `scale_` functions didn't work without the package being loaded (#26)