Skip to content

Commit 5eb368d

Browse files
Merge pull request #13 from ResearchCodingClub/housekeeping
Update descriptive files
2 parents de7a5aa + f6d758a commit 5eb368d

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ we pledge to follow the [University of Sheffield Research Software Engineering C
77

88
Instances of abusive, harassing, or otherwise unacceptable behavior
99
may be reported by following our [reporting guidelines][coc-reporting].
10+
Please contact the [course organiser](mailto:liam.pattinson@york.ac.uk)
11+
with any complaints.
1012

1113
[coc-reporting]: https://rse.shef.ac.uk/community/code_of_conduct#enforcement-guidelines
1214
[coc]: https://rse.shef.ac.uk/community/code_of_conduct

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ use [GitHub flow][github-flow] to manage changes:
4646

4747
NB: The published copy of the lesson is usually in the `main` branch.
4848

49-
[repo]: https://github.com/Romain-Thomas-Shef/FAIR_Management_plan
50-
[repo-issues]: https://github.com/Romain-Thomas-Shef/FAIR_Management_plan/issues
51-
[contact]: mailto:romain.thomas@sheffield.ac.uk
49+
[repo]: https://github.com/researchcodingclub/python-testing-for-research
50+
[repo-issues]: https://github.com/researchcodingclub/python-testing-for-research/issues
51+
[contact]: mailto:liam.pattinson@york.ac.uk
5252
[github]: https://github.com
5353
[github-flow]: https://guides.github.com/introduction/flow/
5454
[github-join]: https://github.com/join

LICENSE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Attribution](https://creativecommons.org/licenses/by/4.0/) licence.
1313
[Changes have been
1414
made](https://github.com/RSE-Sheffield/fair4rs-lesson-setup) to adapt the
1515
template to the specific context of the University of Sheffield's FAIR
16-
for Research Software training programme.
16+
for Research Software training programme, and altered further by
17+
the University of York [Research Coding Club](https://researchcodingclub.github.io/).
1718

1819
Unless otherwise noted, the instructional material in this lesson is
1920
made available under the [Creative Commons Attribution
@@ -35,7 +36,7 @@ Under the following terms:
3536

3637
- **Attribution**---You must give appropriate credit (mentioning that
3738
your work is derived from work that is Copyright (c) The University
38-
of Sheffield and, where practical, provide a [link to the
39+
of York and, where practical, provide a [link to the
3940
license][cc-by-human], and indicate if changes were made. You may do
4041
so in any reasonable manner, but not in any way that suggests the
4142
licensor endorses you or your use.
@@ -59,7 +60,7 @@ Except where otherwise noted, the example programs and other software
5960
provided in this work are made available under the [OSI][osi]-approved
6061
[MIT license][mit-license].
6162

62-
Copyright (c) The University of Sheffield
63+
Copyright (c) The University of York
6364

6465
Permission is hereby granted, free of charge, to any person obtaining a copy of
6566
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ A short course on the basics of software testing in Python using the `pytest` li
44

55
This lesson uses [The Carpentries Workbench][workbench] template.
66

7+
It is derived from the [FAIR2 for Research Software](https://fair2-for-research-software.github.io/)
8+
training course [python-testing-for-research](https://github.com/FAIR2-for-research-software/python-testing-for-research)
9+
by the University of Sheffield.
10+
711
## Course Description
812

913
Whether you are a seasoned developer or just write the occasional script, it's important to know that your code does what you intend, and will continue to do so as you make changes.
@@ -18,7 +22,7 @@ This course seeks to provide you with conceptual understanding and the tools you
1822
- Running a test suite & understanding outputs
1923
- Best practices
2024
- Testing for errors
21-
- Testing data structures
25+
- Testing floating point data
2226
- Fixtures
2327
- Parametrisation
2428
- Testing file outputs
@@ -30,18 +34,27 @@ Contributions are welcome, please refer to the [contribution guidelines](CONTRIB
3034

3135
### Build the lesson locally
3236

33-
To render the lesson locally, you will need to have [R][r] installed. Instructions for using R with the Carpentries template is [available](https://carpentries.github.io/workbench/#installation) but some additional setps have been taken to make sure the enivronment is reproducible using the [`{renv}`](https://rstudio.github.io/renv/articles/renv.html) package and an `renv.lockfile` is included which allows the environment to be re-created along with dependencies.
37+
To render the lesson locally, you will need to have [R][r] installed.
38+
Instructions for using R with the Carpentries template is available on the
39+
[Carpentries website](https://carpentries.github.io/workbench/#installation).
40+
We recommend using the
41+
[`{renv}`](https://rstudio.github.io/renv/articles/renv.html) package.
42+
43+
After cloning the repository, you can set up `renv` and install all packages with:
3444

35-
After cloning the repository, you can set up the `renv` and install all packages with:
3645
``` r
37-
renv::restore()
46+
renv::init()
3847
# Optionally update packages
3948
renv::update()
4049
```
4150
Once you have installed the dependencies, you can render the pages locally by starting R in the project root and running:
51+
4252
``` r
4353
sandpaper::serve()
4454
```
55+
56+
When building the site subsequently, you may need to run `renv::activate()` first.
57+
4558
This will build the pages and start a local web-server in R and open it in your browser. These pages are "live" and will respond to local file changes if you save them.
4659

4760
[git]: https://git-scm.com

0 commit comments

Comments
 (0)