Skip to content

Commit 1871b1c

Browse files
authored
Merge pull request #18 from DataScienceScotland/final-changes
Final changes for v0.1 release
2 parents 09ba7b9 + 64a376f commit 1871b1c

File tree

9 files changed

+601
-555
lines changed

9 files changed

+601
-555
lines changed

.github/SUPPORT.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
Thanks for using sgplot!
44

5+
## Try these first
6+
7+
* If you want to find out more about any of sgplot's functions; help files can be found on the [References](https://datasciencescotland.github.io/sgplot/reference) page of the package website. Alternatively, type `?function_name` into the RStudio console. For example:
8+
9+
``` r
10+
?theme_sg()
11+
```
12+
13+
* If you need help with `ggplot2`, it might be helpful to look at the [sgplot cookbook](https://datasciencescotland.github.io/sgplot/articles/cookbook.html) which contains lots of example code to create various types of chart. The [ggplot2 website](https://ggplot2.tidyverse.org/index.html) may also be helpful.
14+
15+
516
## Where to ask for help
617

718
* If it's a question: Ask the Scottish Government [R Yammer community](https://web.yammer.com/main/groups/eyJfdHlwZSI6Ikdyb3VwIiwiaWQiOiI2MzQ4MzE2NjczIn0).

.github/workflows/render-readme.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on: push
4+
5+
name: render-readme
6+
7+
jobs:
8+
render-readme:
9+
runs-on: ubuntu-latest
10+
env:
11+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
12+
steps:
13+
- name: Checkout repo
14+
uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0
17+
18+
- uses: r-lib/actions/setup-pandoc@v2
19+
20+
- uses: r-lib/actions/setup-r@v2
21+
22+
- uses: r-lib/actions/setup-r-dependencies@v2
23+
with:
24+
extra-packages: any::rmarkdown, local::.
25+
26+
- name: Render README
27+
run: Rscript -e 'rmarkdown::render("README.Rmd")'
28+
29+
- name: Commit rendered README
30+
run: |
31+
git config --local user.name "$GITHUB_ACTOR"
32+
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
33+
git add README.md man/figures/README-*
34+
git commit -m "Re-build README.md" || echo "No changes to commit"
35+
git push origin || echo "No changes to commit"

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: sgplot
22
Title: Graphic Styles and Colours for Scottish Government Plots
3-
Version: 0.0.0.9001
3+
Version: 0.1.0
44
Authors@R: c(
55
person("Scottish Government", , , "statistics.enquiries@gov.scot", role = c("cph", "fnd")),
66
person("Alice", "Byers", , "alice.byers@gov.scot", c("aut", "cre"))

NEWS.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
## sgplot 0.0.0.9001
1+
# sgplot 0.1.0
22

3-
* Developments to `theme_sg()` following testing feedback
4-
* Add [cookbook](https://datasciencescotland.github.io/sgplot/articles/cookbook.html) to pkgdown site
5-
* Add [saving charts](https://datasciencescotland.github.io/sgplot/articles/saving.html) article to pkgdown site
6-
* Add `mm_to_inch()` helper function
7-
* Remove use of showtext package for Google font
8-
9-
## sgplot 0.0.0.9000
10-
11-
* First development version for testing
3+
* First package release
124
* Add functions to create accessible plots using `ggplot2`
13-
* Add pkgdown site (https://datasciencescotland.github.io/sgplot)
5+
* Add pkgdown site (https://datasciencescotland.github.io/sgplot) including [cookbook](https://datasciencescotland.github.io/sgplot/articles/cookbook.html)

README.Rmd

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ More information about the package and its functions can be found on the [sgplot
4141

4242
## Installation
4343

44-
To install sgplot, the remotes package is required. The package can then be installed directly from GitHub with:
44+
If you are working within the Scottish Government network, you can install sgplot in the same way as with other R packages. The easiest way to do this is by using the [pkginstaller](https://github.com/DataScienceScotland/pkginstaller/tree/main) add-in. Further guidance is available on [eRDM](https://erdm.scotland.gov.uk:8443/documents/A42404229/details).
45+
46+
Alternatively, sgplot can be installed directly from GitHub. Note that this method requires the remotes package and may not work from within the Scottish Government network.
4547

4648
``` r
4749
remotes::install_github(
@@ -51,7 +53,7 @@ remotes::install_github(
5153
)
5254
```
5355

54-
Network security settings may prevent `remotes::install_github()` from working. If this is the case, sgplot can be installed by downloading the [zip of the repository](https://github.com/DataScienceScotland/sgplot/archive/main.zip) and running the following code, replacing the section marked `<>` (including the arrows themselves) with the location of the downloaded zip:
56+
Finally, sgplot can also be installed by downloading the [zip of the repository](https://github.com/DataScienceScotland/sgplot/archive/main.zip) and running the following code, replacing the section marked `<>` (including the arrows themselves) with the location of the downloaded zip:
5557

5658
``` r
5759
remotes::install_local(

README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,16 @@ contains lots of examples.
3232

3333
## Installation
3434

35-
To install sgplot, the remotes package is required. The package can then
36-
be installed directly from GitHub with:
35+
If you are working within the Scottish Government network, you can
36+
install sgplot in the same way as with other R packages. The easiest way
37+
to do this is by using the
38+
[pkginstaller](https://github.com/DataScienceScotland/pkginstaller/tree/main)
39+
add-in. Further guidance is available on
40+
[eRDM](https://erdm.scotland.gov.uk:8443/documents/A42404229/details).
41+
42+
Alternatively, sgplot can be installed directly from GitHub. Note that
43+
this method requires the remotes package and may not work from within
44+
the Scottish Government network.
3745

3846
``` r
3947
remotes::install_github(
@@ -43,9 +51,7 @@ remotes::install_github(
4351
)
4452
```
4553

46-
Network security settings may prevent `remotes::install_github()` from
47-
working. If this is the case, sgplot can be installed by downloading the
48-
[zip of the
54+
Finally, sgplot can also be installed by downloading the [zip of the
4955
repository](https://github.com/DataScienceScotland/sgplot/archive/main.zip)
5056
and running the following code, replacing the section marked `<>`
5157
(including the arrows themselves) with the location of the downloaded

0 commit comments

Comments
 (0)