Skip to content

Commit 530ffdd

Browse files
authored
Merge pull request #251 from cmu-delphi/ds/version
repo+doc: follow version conventions from epiprocess
2 parents cd39d25 + 4a73d0e commit 530ffdd

File tree

4 files changed

+34
-24
lines changed

4 files changed

+34
-24
lines changed

.github/pull_request_template.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
### Checklist
2+
3+
Please:
4+
5+
- [ ] Make sure this PR is against "dev", not "main".
6+
- [ ] Request a review from one of the current epiprocess main reviewers:
7+
brookslogan, nmdefries.
8+
- [ ] Makes sure to bump the version number in `DESCRIPTION` and `NEWS.md`.
9+
Always increment the patch version number (the third number), unless you are
10+
making a release PR from dev to main, in which case increment the minor
11+
version number (the second number).
12+
- [ ] Describe changes made in NEWS.md, making sure breaking changes
13+
(backwards-incompatible changes to the documented interface) are noted.
14+
Collect the changes under the next release number (e.g. if you are on
15+
1.7.2, then write your changes under the 1.8 heading).
16+
17+
### Change explanations for reviewer
18+
19+
### Magic GitHub syntax to mark associated Issue(s) as resolved when this is merged into the default branch
20+
21+
- Resolves #{issue number}

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: epidatr
22
Type: Package
33
Title: Client for Delphi's 'Epidata' API
4-
Version: 1.0.0.9000
4+
Version: 1.0.1
55
Date: 2023-12-07
66
Authors@R:
77
c(

DEVELOPMENT.md

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ install.packages(c('devtools', 'pkgdown', 'styler', 'lintr')) # install dev depe
55
devtools::install_deps(dependencies = TRUE) # install package dependencies
66
devtools::document() # generate package meta data and man files
77
devtools::build() # build package
8-
98
```
109

1110
## Validating the package
@@ -20,41 +19,31 @@ devtools::check() # check package for errors
2019

2120
## Developing the documentation site
2221

23-
The [documentation site](https://cmu-delphi.github.io/epidatr/) is built off of the `main` branch. The `dev` version of the site is available at https://cmu-delphi.github.io/epidatr/dev.
22+
Our CI builds two version of the documentation:
23+
24+
- https://cmu-delphi.github.io/epidatr/ from the `main` branch and
25+
- https://cmu-delphi.github.io/epidatr/dev from the `dev` branch.
2426

25-
The documentation site can be previewed locally by running in R
27+
The documentation site can be previewed locally by running in R:
2628

2729
```r
30+
# Should automatically open a browser
2831
pkgdown::build_site(preview=TRUE)
2932
```
3033

31-
The `main` version is available at `file:///<local path>/epidatr/docs/index.html` and `dev` at `file:///<local path>/epidatr/docs/dev/index.html`.
34+
If the above does not open a browser, you can try using a Python server from the
35+
command line:
3236

33-
You can also build the docs manually and launch the site with python. From the terminal, this looks like
3437
```bash
3538
R -e 'devtools::document()'
39+
R -e 'pkgdown::build_site()'
3640
python -m http.server -d docs
3741
```
3842

39-
For `pkgdown` to correctly generate both public (`main`) and `dev` documentation sites, the package version in `DESCRIPTION` on `dev` must have four components, and be of the format `x.x.x.9000`. The package version on `main` must be in the format `x.x.x`.
43+
## Versioning
4044

41-
The documentation website is updated on push or pull request to the `main` and `dev` branches.
45+
Please follow the guidelines in the [PR template document](.github/pull_request_template.md).
4246

4347
## Release process
4448

45-
### Manual
46-
4749
TBD
48-
49-
### Automated (currently unavailable)
50-
51-
The release consists of multiple steps which can be all done via the GitHub website:
52-
53-
1. Go to [create_release GitHub Action](https://github.com/cmu-delphi/epidatr/actions/workflows/create_release.yml) and click the `Run workflow` button. Enter the next version number or one of the magic keywords (patch, minor, major) and hit the green `Run workflow` button.
54-
2. The action will prepare a new release and will end up with a new [Pull Request](https://github.com/cmu-delphi/epidatr/pulls)
55-
3. Let the code owner review the PR and its changes and let the CI check whether everything builds successfully
56-
4. Once approved and merged, another GitHub action job starts which automatically will
57-
1. create a git tag
58-
2. create another [Pull Request](https://github.com/cmu-delphi/epidatr/pulls) to merge the changes back to the `dev` branch
59-
3. create a [GitHub release](https://github.com/cmu-delphi/epidatr/releases) with automatically derived release notes
60-
5. Release to CRAN

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# epidatr 1.0.0.9000
1+
# epidatr 1.1.0
22

33
- Function reference now displays commonly-used functions first (#205).
44
- Endpoints now fail when passed misspelled arguments (#187, #201).

0 commit comments

Comments
 (0)