Skip to content

Commit d6ddba0

Browse files
Merge ed3b507 into f4186b9
2 parents f4186b9 + ed3b507 commit d6ddba0

File tree

3 files changed

+57
-49
lines changed

3 files changed

+57
-49
lines changed
File renamed without changes.

.github/CONTRIBUTING.md

+56-49
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
# Contribution Guidelines
22

3-
First of all, thank you for taking the time to contribute! ✌️ 🎉
3+
🙏 Thank you for taking the time to contribute!
44

5-
We love your input regardless of its size, content or scope - whether it is an issue, feature request, bug-fix or documentation enhancement.
6-
7-
Thanks 🙏 You rock 🤘
5+
Your input is deeply valued, whether an issue, a pull request, or even feedback, regardless of size, content or scope.
86

97
## Table of contents
108

@@ -14,105 +12,114 @@ Thanks 🙏 You rock 🤘
1412

1513
[🗃 License](#license)
1614

17-
[🐛 How to report a bug?](#how-to-report-a-bug)
18-
19-
[💡 How to request the change?](#how-to-request-the-change)
15+
[📜 Issues](#issues)
2016

21-
[🚩 How to submit a change?](#how-to-submit-a-change)
17+
[🚩 Pull requests](#pull-requests)
2218

2319
[👗 Style guide](#style-guide)
2420

25-
[🧐 Recognition model](#recognition-model)
21+
[🏆 Recognition model](#recognition-model)
2622

27-
[Any questions](#any-questions)
23+
[Questions](#questions)
2824

2925
## Getting started
3026

31-
For an introduction, please read [`README`](README.md) file. You can also find vignettes [here](vignettes/). Usually you will find a "Getting started" article. Please also see the package manual in the form of a `pkgdown` website.
27+
Please refer the project [documentation][docs] for a brief introduction. Please also see other [articles][articles] within the project documentation for additional information.
3228

3329
## Code of Conduct
3430

35-
This project is governed by [Code of Conduct](../CODE_OF_CONDUCT.md). By participating, you are expected to follow the rules outlined there.
31+
A [Code of Conduct](CODE_OF_CONDUCT.md) governs this project. Participants and contributors are expected to follow the rules outlined therein.
3632

3733
## License
3834

39-
All of your code changes would be under the same [license](../LICENSE) that covers this project.
35+
All your contributions will be covered by this project's [license][license].
4036

41-
## How to report a bug?
37+
## Issues
4238

43-
We use GitHub to track issues, feature requests as well as bugs. Before opening a new issue please double-check if it's already reported (but don't worry if to be a duplicate - we will manage). If already there - up-vote ⬆️. We will have a look at it faster!
39+
We use GitHub to track issues, feature requests, and bugs. Before submitting a new issue, please check if the issue has already been reported. If the issue already exists, please upvote the existing issue 👍.
4440

45-
We kindly ask you to write a good issue with a minimal and reproducible example that demonstrates the problem. It would also be great to know your local environment (R session info) as well. You will find our template for issues when opening a bug ticket. This will speed up the fixing process a lot! 📈.
41+
For new feature requests, please elaborate on the context and the benefit the feature will have for users, developers, or other relevant personas.
4642

47-
## How to request the change?
43+
## Pull requests
4844

49-
If you notice a missing feature or you have an idea how to enhance existing functionalities - please let us know by creating a new issue. Before opening a new issue please double-check if it's already reported (but don't worry if occurs to be a duplicate - we will manage). If already there - up-vote ⬆️. We will have a look at it faster!
45+
### Github flow
5046

51-
Please elaborate on "why?" - what's the context, what's the benefit and for whom. You will find our template when opening a feature request ticket. This will help us prioritize and submit meaningful changes.
47+
This repository uses the [Github flow](https://docs.github.com/en/get-started/quickstart/github-flow) model for collaboration. To submit a pull request:
5248

53-
## How to submit a change?
49+
1. Create a branch.
5450

55-
### GitHub Flow
51+
Please see the [branch naming convention](#branch-naming-convention) below. If you don't have write access to this repository, please fork it.
5652

57-
We are following [GitHub Flow](https://docs.github.com/en/get-started/quickstart/github-flow) to collaborate in this repository. In order to submit the changes please do the following:
53+
2. Make changes.
5854

59-
1. Open a branch
55+
Make sure your code:
56+
* passes all checks imposed by GitHub Actions
57+
* is well documented
58+
* is well tested with unit tests sufficiently covering the changes introduced
6059

61-
Please see branch naming convention below. If you don't have write access please fork it first.
60+
3. Create a pull request (PR).
6261

63-
1. Make changes.
62+
In the pull request description, please link the relevant issue (if any), provide a detailed description of the change, and include any assumptions.
6463

65-
Make sure your code passes all the checks and is well documented and tested so as not to decrease existing test coverage 💪.
64+
4. Address review comments, if any.
6665

67-
1. Create a PR(s)
66+
5. Receive an approval.
6867

69-
Please link an issue and make a good change description. Include development assumptions when necessary. Give all the details for a reviewer to efficiently check your changes.
68+
Merge your PR if you have write access. Otherwise, the reviewer will merge the PR on your behalf.
7069

71-
1. Address review comments
70+
6. Pat yourself on the back.
7271

73-
Please apply changes where necessary. If you disagree with a reviewer - please explain why.
72+
Congratulations! 🎉
73+
You are now an official contributor to this project! We are grateful for your contribution.
7474

75-
1. Once approved - merge your PR(s) and delete a branch
75+
### Branch naming convention
7676

77-
### Branching convention
77+
Suppose your changes are related to a current issue in the current project; please name your branch as follows: `<issue_id>_<short_description>`. Please use underscore (`_`) as a delimiter for word separation. For example, `420_fix_ui_bug` would be a suitable branch name if your change is resolving and UI-related bug reported in issue number `420` in the current project.
7878

79-
In case you are working on a task inside one specific repository, please name your branch `<issue_id>_<short_description>` all lowercase. Multiple words of the description should be divided by an underscore (`_`). E.g. `15_fix_spelling_error` in case you try to solve a spelling mistake mentioned in the issue number `15`.
80-
81-
In case you are working on a task from one repository that affects multiple repositories, please always name your branches: `<issue_id>_<issue_repo>_<short description>` all lowercase. Multiple words of the description should be divided by an underscore (`_`). E.g. `15_abc_fix_spelling_error` in case you try to solve a spelling mistake inside `xyz` which closes issue `15` inside `abc`.
79+
If your change affects multiple repositories, please name your branches as follows: `<issue_id>_<issue_repo>_<short description>`. For example, `69_awesomeproject_fix_spelling_error` would reference issue `69` reported in project `awesomeproject` and aims to resolve one or more spelling errors in multiple (likely related) repositories.
8280

8381
### `monorepo` and `staged.dependencies`
8482

85-
Sometimes you might need to change upstream dependent package(s) to be able to submit a meaningful change. We are using [`staged.dependencies`](https://github.com/openpharma/staged.dependencies) functionality to simulate a `monorepo` behavior. The configuration is already in the [`staged_dependencies.yaml`](../staged_dependencies.yaml) file. You just need to name the feature branches identically. This is the only exception from branch naming convention described above. Please read the package manual for more details.
83+
Sometimes you might need to change upstream dependent package(s) to be able to submit a meaningful change. We are using [`staged.dependencies`](https://github.com/openpharma/staged.dependencies) functionality to simulate a `monorepo` behavior. The dependency configuration is already specified in this project's `staged_dependencies.yaml` file. You need to name the feature branches appropriately. _This is the only exception from the branch naming convention described above_.
84+
85+
Please refer to the [staged.dependencies package documentation](https://openpharma.github.io/staged.dependencies/) for more details.
8686

8787
### Recommended development environment & tools
8888

8989
#### R & package versions
9090

91-
We continuously test our packages against the newest R version as well as a given package dependencies. We recommend to set-up your working environment in the same way. You can find all the details in a given GitHub Action execution log - there is a step that prints out session info.
91+
We continuously test our packages against the newest R version along with the most recent dependencies from CRAN and BioConductor. We recommend that your working environment is also set up in the same way. You can find the details about the R version and packages used in the `R CMD check` GitHub Action execution log - there is a step that prints out the R `sessionInfo()`.
9292

93-
If you find out any bugs on the older version of dependencies - please create appropriate bug ticket.
93+
If you discover bugs on older R versions or with an older set of dependencies, please create the relevant bug reports.
9494

9595
#### `pre-commit`
9696

97-
We highly recommend the [`pre-commit`](https://pre-commit.com/) tool combined with [`R hooks for pre-commit`](https://github.com/lorenzwalthert/precommit) to execute some of the checks prior committing and pushing. The configuration is already there in a repository ([here](../.pre-commit-config.yaml)). Please, follow the installation guide on the official [`pre-commit` page](https://github.com/lorenzwalthert/precommit) and the [`GitHub` `readme` page](https://github.com/lorenzwalthert/precommit#installation) for the R hooks.
97+
We highly recommend that you use the [`pre-commit`](https://pre-commit.com/) tool combined with [`R hooks for pre-commit`](https://github.com/lorenzwalthert/precommit) to execute some of the checks before committing and pushing your changes.
98+
99+
Pre-commit hooks are already available in this repository's `.pre-commit-config.yaml` file.
98100

99101
## Style guide
100102

101-
This repository follows standard [`tidyverse` style guide](https://style.tidyverse.org/) and it's being checked against it by [`lintr`](https://github.com/r-lib/lintr). There are some slight modifications to its default settings available in the [`.lintr`](../.lintr) file.
103+
This repository follows the standard [`tidyverse` style guide](https://style.tidyverse.org/) and uses [`lintr`](https://github.com/r-lib/lintr) for lint checks. Customized lint configurations are available in this repository's `.lintr` file.
102104

103-
Although it allows for some flexibility - we recommend sticking to the style of the existing code.
105+
## Recognition model
104106

105-
Please note that there is a style and also `lintr` check in place that will validate your code.
107+
As mentioned previously, all contributions are deeply valued and appreciated. While all contribution data is available as part of the [repository insights][insights], to recognize a _significant_ contribution and hence add the contributor to the package authors list, the following rules are enforced:
106108

107-
## Recognition model
109+
* Minimum 5% of lines of code authored* (determined by `git blame` query) OR
110+
* Being at the top 5 contributors in terms of number of commits OR lines added OR lines removed*
108111

109-
Any contribution is highly welcomed and appreciated. While all the contribution data is already there in GitHub repository insights feature, we introduced some objective rules to recognize a _significant_ contribution so as to became a package author:
112+
*Excluding auto-generated code, including but not limited to `roxygen` comments or `renv.lock` files.
110113

111-
- Minimum 5% of lines of code authored (determined by `git blame` query) OR
112-
- Being at the top 5 contributors in terms of number of commits OR lines added OR lines removed.
114+
The package maintainer also reserves the right to adjust the criteria to recognize contributions.
113115

114-
The package maintainer also reserves the rights to manually adjust the criteria to recognize contributions.
116+
## Questions
115117

116-
## Any questions
118+
If you have further questions regarding the contribution guidelines, please contact the package/repository maintainer.
117119

118-
If you have any further questions regarding contribution - please reach out to the repository maintainer(s)!
120+
<!-- urls -->
121+
[issues]: https://github.com/insightsengineering/osprey/issues
122+
[docs]: https://insightsengineering.github.io/osprey/index.html
123+
[articles]: https://insightsengineering.github.io/osprey/articles/index.html
124+
[license]: https://insightsengineering.github.io/osprey/LICENSE-text.html
125+
[insights]: https://github.com/insightsengineering/osprey/pulse

DESCRIPTION

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ VignetteBuilder:
4444
knitr
4545
Config/Needs/website: insightsengineering/nesttemplate
4646
Encoding: UTF-8
47+
Language: en-US
4748
LazyData: true
4849
Roxygen: list(markdown = TRUE)
4950
RoxygenNote: 7.2.0

0 commit comments

Comments
 (0)