Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TARDIS Code of Conduct #1234

Merged
merged 10 commits into from
Jul 15, 2020
Merged

Conversation

wkerzendorf
Copy link
Member

Adding an adapted Code of Conduct for TARDIS

@codecov
Copy link

codecov bot commented Jul 14, 2020

Codecov Report

Merging #1234 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1234   +/-   ##
=======================================
  Coverage   80.63%   80.63%           
=======================================
  Files          41       41           
  Lines        3424     3424           
=======================================
  Hits         2761     2761           
  Misses        663      663           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2c68286...d1e3ae6. Read the comment docs.

docs/team.rst Outdated
@@ -7,24 +7,103 @@ Team
TARDIS is developed by a multidisciplinary team. We adhere to the Astropy
`code of conduct <https://www.astropy.org/code_of_conduct.html>`_.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still the case after the update or does this sentence need an update too?

@wkerzendorf wkerzendorf force-pushed the docs/code_of_conduct branch from c43c1c7 to 653922d Compare July 14, 2020 20:57
@wkerzendorf wkerzendorf changed the title Addition of TARDIS Code of Conduct TARDIS Code of Conduct Jul 14, 2020
@wkerzendorf wkerzendorf marked this pull request as ready for review July 14, 2020 21:02
* We pledge to welcome those interested in joining the community, and realize that including people with a variety of opinions and backgrounds will only serve to enrich our community. In particular, discussions relating to pros/cons of various technologies, programming languages, and so on are welcome, but these should be done with respect, taking proactive measure to ensure that all participants are heard and feel confident that they can freely express their opinions.
* We pledge to welcome questions and answer them respectfully, paying particular attention to those new to the community. We pledge to provide respectful criticisms and feedback in forums, especially in discussion threads resulting from code contributions.
* We pledge to be conscientious of the perceptions of the wider community and to respond to criticism respectfully. We will strive to model behaviors that encourage productive debate and disagreement, both within our community and where we are criticized. We will treat those outside our community with the same respect as people within our community.
* We pledge to help the entire community follow the code of conduct, and to not remain silent when we see violations of the code of conduct. We will take action when members of our community violate this code such as contacting the TARDIS core or the TARDIS ombudsperson (who is outside of the TARDIS collaboration and will treat reports confidentially) or talking privately with the person.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to include contact info for the ombudsperson, or maybe link to the teams page if contact info is shown there?

Copy link
Contributor

@marxwillia marxwillia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks good. See my comment about ombudsperson contact info.

@wkerzendorf wkerzendorf merged commit 210f89d into tardis-sn:master Jul 15, 2020
ebjordi pushed a commit to ebjordi/tardis that referenced this pull request Jul 17, 2020
* Update team.rst - Add roles and descriptions

Added roles and descriptions to the team page

* Update team.rst - Added new GSoC students

Update GSoC students section

* Update team.rst - Added new roles

Added new roles and minor style changes

* add several nbsphinx related options

* restructure the Governance model page

* re-enabled nbsphinx

* add adapted CoC

* ammending code of conduct in the root

* add code of conduct

* getting upstream/master team.rst

Co-authored-by: Yssa Camacho <[email protected]>
atharva-2001 pushed a commit to atharva-2001/tardis that referenced this pull request Oct 1, 2021
* Update team.rst - Add roles and descriptions

Added roles and descriptions to the team page

* Update team.rst - Added new GSoC students

Update GSoC students section

* Update team.rst - Added new roles

Added new roles and minor style changes

* add several nbsphinx related options

* restructure the Governance model page

* re-enabled nbsphinx

* add adapted CoC

* ammending code of conduct in the root

* add code of conduct

* getting upstream/master team.rst

Co-authored-by: Yssa Camacho <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants