From 5c01e36519949d4be84eecbbbe020008c0416a24 Mon Sep 17 00:00:00 2001
From: Brent Huisman <brenthuisman@users.noreply.github.com>
Date: Mon, 31 May 2021 18:40:05 +0200
Subject: [PATCH] Add code of conduct (#1476)
---
CODE_OF_CONDUCT.md | 1 +
CONTRIBUTING.md | 6 +++---
doc/contrib/index.rst | 36 +++++++++++++++++++++++++++++++++++-
doc/contrib/pr.rst | 2 +-
4 files changed, 40 insertions(+), 5 deletions(-)
create mode 100644 CODE_OF_CONDUCT.md
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..65058a4a
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+Please find our Code of Conduct at [doc/contrib/index.rst](https://docs.arbor-sim.org/en/latest/contrib/index.html#code-of-conduct).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 93df75ca..8f6ae3f9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,8 +8,8 @@ There are many ways to contribute: writing tutorials or blog posts, improving th
documentation, submitting bug reports and feature requests or writing code which can be
incorporated into Arbor itself.
-The Arbor documentation has a [Contributing section](https://docs.arbor-sim.org/en/latest/contrib) where we have laid out how you
-can go about making your contribution.
+The Arbor documentation has a [Contributing section](https://docs.arbor-sim.org/en/latest/contrib)
+where we have laid out how you can go about making your contribution.
## Get in touch
@@ -18,4 +18,4 @@ You can reach out in the following ways:
* [Discussions](https://github.com/arbor-sim/arbor/discussions). Any questions or remarks regarding using Arbor
for your research are welcome.
* [Slack](https://mcnest.slack.com). If you're interested in developing Arbor itself, you can visit our Slack.
-* [Email](mailto:arbor-sim@fz-juelich.de).
+* [Email](mailto:contact@arbor-sim.org).
diff --git a/doc/contrib/index.rst b/doc/contrib/index.rst
index 1f0a0546..b36697b7 100644
--- a/doc/contrib/index.rst
+++ b/doc/contrib/index.rst
@@ -108,6 +108,40 @@ We're always happy to hear about Arbor being used! Have you used Arbor to create
Have you used Arbor in a publication? Do you have a workflow or tool that involves Arbor?
Get in touch and we'd be very happy to showcase your work through our channels.
+.. _contribindex-coc:
+
+Code of Conduct
+---------------
+
+We have a brief code of conduct which we ask you to respect:
+
+* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or any other characteristic.
+* Please avoid using overtly provoking aliases or nicknames that might detract from a friendly, safe and welcoming environment for all.
+* Please be kind and courteous. There’s no need to be mean or rude.
+* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs.
+* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
+
+Concerns
+~~~~~~~~
+
+If you believe one of these standards has been violated, you can reach out to the Arbor project by email, `contact@arbor-sim.org <mailto:contact@arbor-sim.org>`_. Nora Abi Akar, Sam Yates and Brent Huisman read this inbox and will get back to you in a timely manner. Your complaint and the private information therein will be handled with the utmost care and confidentiality. Alternatively, you can contact someone outside of the Arbor team at Ebrains, [see below](#ebrains).
+
+In general, violations of the community standards will generate one or more of the following responses from the Arbor Team:
+
+1. Informal feedback, privately and/or (for public violations) in the forum where a violation appeared, with the goal of encouraging good-faith contributions and mutual understanding while making offenders aware of the problem and preventing future incidents. Where possible, good intentions of the participants should be assumed.
+2. Gross online violations of community standards may result in immediate deletion of the offending comments, coupled with informal feedback.
+3. For severe cases, especially persistent, disruptive violations despite repeated warnings and other feedback, a formal investigation may be started through the Ebrains Ombudsperson.
+
+Ebrains
+~~~~~~~
+
+Arbor is an Ebrains/HBP project. Its policies and recourse options in case of concern are therefore available to you. In addition, the European Commission recognizes the ALLEA Code of Conduct as a model for all research it funds, which includes Ebrains/HBP/Arbor.
+
+* `Ebrains Terms <https://ebrains.eu/terms>`_
+* `ALLEA Code of Conduct <https://allea.org/code-of-conduct>`_
+* `Ebrains Point of registration for ethical concerns <https://www.humanbrainproject.eu/en/social-ethical-reflective/about/register-ethical-concern/>`_
+* `Ebrains Ombudsperson <mailto:research-integrity@ebrains.eu>`_
+
.. _contribindex-contact:
Get in touch
@@ -120,4 +154,4 @@ You can reach out in the following ways:
welcome.
- `Slack <https://mcnest.slack.com>`__. If you’re interested in
developing Arbor itself, you can visit our Slack.
-- `Email <mailto:arbor-sim@fz-juelich.de>`__.
+- `Email <mailto:contact@arbor-sim.org>`__.
diff --git a/doc/contrib/pr.rst b/doc/contrib/pr.rst
index a774b023..57afa5aa 100644
--- a/doc/contrib/pr.rst
+++ b/doc/contrib/pr.rst
@@ -31,7 +31,7 @@ the workflow is as follows:
`BSD 3-Clause "New" or "Revised" License <https://github.com/arbor-sim/arbor/blob/master/LICENSE>`_,
as the Arbor project.
If this is a problem for you, please contact us at
- `arbor-sim@fz-juelich.de <mailto:arbor-sim@fz-juelich.de>`__.
+ `contact@arbor-sim.org <mailto:contact@arbor-sim.org>`__.
5. A PR on Github is automatically built and tested by GitHub Actions CI pipelines.
You can run these tests yourself by building them first
(``make tests``) and then running them (``./bin/*unit*``).
--
GitLab