Skip to content

Commit 6f55f56

Browse files
GitHKAndrei Neagu
and
Andrei Neagu
authored
documentation enhancement (#1481)
* added base CONTRIBUTING.md guidelines as a template * new branch created * added checksum check to docker-compose download - if download fails (eg: github is not 100% up) this will avoid unexpected problems down the line * added project specific notes to the CONTRIBUTING.md guidelines * added other requested dependencies * added reference to contributing page * updated readme * added PR review suggestions to CONTRIBUTING.md * renaming * added more beginner friendly FAQs * linking code conventions as FAQ * added squash instructions * added references to coding sytles and linters * added docs on protection against upstream pushing * linked no upstream push + tech specs & tech eval * unused, removed * linked comp. services overview and fixed a link * added some videos to the FAQs * added tip to apply migrations Co-authored-by: Andrei Neagu <[email protected]>
1 parent 311a074 commit 6f55f56

File tree

7 files changed

+353
-109
lines changed

7 files changed

+353
-109
lines changed

CONTRIBUTING.md

+196
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
# Contributing guidelines
2+
3+
We adhere to the [Contributor Covenant Code of Conduct](#contributor-covenant-code-of-conduct) found below.
4+
5+
### Want to add a new feature?
6+
7+
- avoid pushing new features directly (also [consider no upstream pushing](docs/no-upstream-push.md))
8+
- [fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) to your private github
9+
- create a new branch with a name meaningful for the feature at hand
10+
- [create a Draft Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) with `WIP:` in its name to the `master` branch (example: `WIP: documentation updates`)
11+
- commit all your work to your new branch; other developers can provided feedback by reviewing your pull request
12+
- when the feature is ready: remove the `WIP:` and set it ready to review
13+
- when your changes get approved, remember to always select **Squash and merge** from the drop-down button
14+
15+
New features are merged when CI is passing and two other members approve your pull request.
16+
17+
### CI notes
18+
19+
For GitHub Actions, the CI needs to pull and push docker images to a repository. Using
20+
[docker hub](https://hub.docker.com) is advised.
21+
New registries will be created and images will be pushed and pulled during builds. Have a look
22+
at [docker-compose-build.yml](services/docker-compose-build.yml) for a full list of names.
23+
To avoid collisions make sure the names of the services are not used by your other projects.
24+
25+
26+
To enable GitHub Actions on your forked repository:
27+
28+
- go to the `Actions` page and enable them
29+
- go to the repo's `Settings` page and the click on `Secrets`
30+
- you have to add the following:
31+
- `DOCKER_USERNAME` docker hub username
32+
- `DOCKER_REGISTRY` docker hub username
33+
- `DOCKER_PASSWORD` docker hub access token **(avoid using your password)**
34+
35+
### Code styles and conventions
36+
37+
Current setup: [ESLint](https://eslint.org) for `JavaScript` and [Black](https://black.readthedocs.io/en/stable/) + [Pylint](https://www.pylint.org) for `Python`. Have a look in the project root for individual configuration files.
38+
39+
Read more at [Coding Conventions and Linters](docs/coding-conventions.md).
40+
41+
### FAQ
42+
43+
**Q:** I have strange database errors, but I did not change anything. What could I try?
44+
**A:** After starting the application, apply Postgres migrations, run `make help` in project root for details.
45+
46+
**Q:** I am new to the project, how do I view all available commands?
47+
**A:** Run `make help` in the directory containing a `Makefile`. Usage will be shown. Don't be afraid to read the file, it is quite strait forward and well documented.
48+
49+
**Q:** My pull request's CI is failing to push/pull images from Docker Hub?
50+
**A:** Check your settings again, [see CI-notes](#ci-notes) and retry.
51+
52+
**Q:** It is not clear how dependencies work. Where can I read more?
53+
**A:** [Management of python dependencies](docs/python-dependencies.md) has a detailed explanation and useful resources.
54+
55+
**Q:** I see and `api` folder full of text files, what is it?
56+
**A:** Look at [APIs development guidelines](api/README.md) it will point you in the right direction.
57+
58+
**Q:** Do you need to commit something (maybe work in progress) and it makes no sense to have the CI run it?
59+
**A:** Add `[ci skip]` in any part of your commit message. The CI will not run get started.
60+
61+
**Q:** I don't have a good understanding of the aims of the project. Where can I read more?
62+
**A:** [D1.1 Technical Specs. & Technology Evaluation](https://osparc-docs.readthedocs.io/en/latest/) is extensive, but explains the decision making behind most of the code. Please consider reading it. Afterwords you can better grasp the [Computational backend](docs/comp-services.md) description.
63+
64+
**Q:** Can I have some sort of introduction video about the project?
65+
**A:** Have a look at the following videos, targeted for wider audiences: [What is the SPARC program?](https://www.youtube.com/watch?v=IrZS_IHgrcE&feature=emb_title), [Ideas Lab Introduction to o²S²PARC](https://www.youtube.com/watch?time_continue=11&v=Q96jyFgSFHc&feature=emb_title) and [SPARC Webinar: Introduction to o²S²PARC](https://www.youtube.com/watch?v=vrdVealYydE&feature=emb_title)
66+
67+
---
68+
69+
# Contributor Covenant Code of Conduct
70+
71+
## Our Pledge
72+
73+
We as members, contributors, and leaders pledge to make participation in our
74+
community a harassment-free experience for everyone, regardless of age, body
75+
size, visible or invisible disability, ethnicity, sex characteristics, gender
76+
identity and expression, level of experience, education, socio-economic status,
77+
nationality, personal appearance, race, religion, or sexual identity
78+
and orientation.
79+
80+
We pledge to act and interact in ways that contribute to an open, welcoming,
81+
diverse, inclusive, and healthy community.
82+
83+
## Our Standards
84+
85+
Examples of behavior that contributes to a positive environment for our
86+
community include:
87+
88+
* Demonstrating empathy and kindness toward other people
89+
* Being respectful of differing opinions, viewpoints, and experiences
90+
* Giving and gracefully accepting constructive feedback
91+
* Accepting responsibility and apologizing to those affected by our mistakes,
92+
and learning from the experience
93+
* Focusing on what is best not just for us as individuals, but for the
94+
overall community
95+
96+
Examples of unacceptable behavior include:
97+
98+
* The use of sexualized language or imagery, and sexual attention or
99+
advances of any kind
100+
* Trolling, insulting or derogatory comments, and personal or political attacks
101+
* Public or private harassment
102+
* Publishing others' private information, such as a physical or email
103+
address, without their explicit permission
104+
* Other conduct which could reasonably be considered inappropriate in a
105+
professional setting
106+
107+
## Enforcement Responsibilities
108+
109+
Community leaders are responsible for clarifying and enforcing our standards of
110+
acceptable behavior and will take appropriate and fair corrective action in
111+
response to any behavior that they deem inappropriate, threatening, offensive,
112+
or harmful.
113+
114+
Community leaders have the right and responsibility to remove, edit, or reject
115+
comments, commits, code, wiki edits, issues, and other contributions that are
116+
not aligned to this Code of Conduct, and will communicate reasons for moderation
117+
decisions when appropriate.
118+
119+
## Scope
120+
121+
This Code of Conduct applies within all community spaces, and also applies when
122+
an individual is officially representing the community in public spaces.
123+
Examples of representing our community include using an official e-mail address,
124+
posting via an official social media account, or acting as an appointed
125+
representative at an online or offline event.
126+
127+
## Enforcement
128+
129+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
130+
reported to the community leaders responsible for enforcement at
131+
132+
All complaints will be reviewed and investigated promptly and fairly.
133+
134+
All community leaders are obligated to respect the privacy and security of the
135+
reporter of any incident.
136+
137+
## Enforcement Guidelines
138+
139+
Community leaders will follow these Community Impact Guidelines in determining
140+
the consequences for any action they deem in violation of this Code of Conduct:
141+
142+
### 1. Correction
143+
144+
**Community Impact**: Use of inappropriate language or other behavior deemed
145+
unprofessional or unwelcome in the community.
146+
147+
**Consequence**: A private, written warning from community leaders, providing
148+
clarity around the nature of the violation and an explanation of why the
149+
behavior was inappropriate. A public apology may be requested.
150+
151+
### 2. Warning
152+
153+
**Community Impact**: A violation through a single incident or series
154+
of actions.
155+
156+
**Consequence**: A warning with consequences for continued behavior. No
157+
interaction with the people involved, including unsolicited interaction with
158+
those enforcing the Code of Conduct, for a specified period of time. This
159+
includes avoiding interactions in community spaces as well as external channels
160+
like social media. Violating these terms may lead to a temporary or
161+
permanent ban.
162+
163+
### 3. Temporary Ban
164+
165+
**Community Impact**: A serious violation of community standards, including
166+
sustained inappropriate behavior.
167+
168+
**Consequence**: A temporary ban from any sort of interaction or public
169+
communication with the community for a specified period of time. No public or
170+
private interaction with the people involved, including unsolicited interaction
171+
with those enforcing the Code of Conduct, is allowed during this period.
172+
Violating these terms may lead to a permanent ban.
173+
174+
### 4. Permanent Ban
175+
176+
**Community Impact**: Demonstrating a pattern of violation of community
177+
standards, including sustained inappropriate behavior, harassment of an
178+
individual, or aggression toward or disparagement of classes of individuals.
179+
180+
**Consequence**: A permanent ban from any sort of public interaction within
181+
the community.
182+
183+
## Attribution
184+
185+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
186+
version 2.0, available at
187+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
188+
189+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
190+
enforcement ladder](https://github.com/mozilla/diversity).
191+
192+
[homepage]: https://www.contributor-covenant.org
193+
194+
For answers to common questions about this code of conduct, see the FAQ at
195+
https://www.contributor-covenant.org/faq. Translations are available at
196+
https://www.contributor-covenant.org/translations.

0 commit comments

Comments
 (0)