From 081b3dff32c238d51275be051b11288b3361ed0c Mon Sep 17 00:00:00 2001 From: Yssa Camacho Date: Wed, 8 Jul 2020 12:08:11 -0400 Subject: [PATCH 01/10] Update team.rst - Add roles and descriptions Added roles and descriptions to the team page --- docs/team.rst | 87 +++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 59 deletions(-) diff --git a/docs/team.rst b/docs/team.rst index 4c94a43e652..d1bd3aa4f9a 100644 --- a/docs/team.rst +++ b/docs/team.rst @@ -4,47 +4,40 @@ Team **** -TARDIS is developed by a multidisciplinary team. We adhere to our -`code of conduct `_. +TARDIS is developed by a multidisciplinary team. We adhere to the Astropy +`code of conduct `_. The development of TARDIS and associated software tools are made possible through several coordination roles fulfilled by community members. This encompasses a broad scope of responsibilities ranging from direct package development to communication, distribution, and managerial activities. The roles and their description can be found here: -* **Principal Investigator** - - Wolfgang Kerzendorf -* **TARDIS CORE** [alphabetical] - - Yssavo Camacho-Neves, Andreas Flörs, Alice Harpole, Vytautas Jancauskas, Wolfgang Kerzendorf (founder), Luke Shingles, Stuart Sim (founder), Christian Vogl, Marc Williamson -* **TARDIS GSoC Coordinators (2020)** - Yssavo Camacho-Neves, Alice Harpole, Wolfgang Kerzendorf, Marc Williamson -* **TARDIS GSoC Mentors (2020)** - - Alice Harpole, Andreas Flörs, Christian Vogl, Fionntan Callan, James Gillanders, Luciano G Silvestri, Stuart Sim, Wolfgang Kerzendorf, Yssavo Camacho-Neves, Andrew Fullard, Arjun Savel, Brian Cherinka, Jack O'Brien, Lindsey Kwok, Luke Shingles, Marc Williamson, Mark Magee, Michael Moltenbrey, Vytautas Jancauskas -* **Ombudsperson** - - Michael Zingale (contact info on https://zingale.github.io/) -* **Software Architect** - - Alice Harpole -* **Issues / Pull Request** - - Andreas Flörs -* **Continuous Integration / Deployment / Testing** - - Christian Vogl -* **Funding / Financial** - - Marc Williamson -* **Science / Science Meeting / Publications** - - Yssavo Camacho-Neves -* **Diversity, Equity, and Inclusion** - - Wolfgang Kerzendorf - -**Principal Investigator** -- Guides the scientific and the educational activities of TARDIS -- Advised by TARDIS Core +.. list-table:: + :widths: 100 100 + :header-rows: 1 + + * - Roles + - Person/People + * - TARDIS CORE + - Wolfgang Kerzendorf , Yssavo Camacho-Neves, Alice Harpole, Marc Williamson, Andreas Flörs, Christian Vogl, Stuart Sim, Luke Shingles, Vytautas Jancauskas + * - TARDIS GSoC Coordinators (2020) + - Wolfgang Kerzendorf , Yssavo Camacho-Neves, Alice Harpole, Marc Williamson + * - TARDIS GSoC Mentors (2020) + - Alice Harpole, Andreas Flörs, Christian Vogl, Fionntan Callan, James Gillanders, Luciano G Silvestri, Stuart Sim, Wolfgang Kerzendorf, Yssavo Camacho-Neves, Andrew Fullard, Arjun Savel, Brian Cherinka, Jack O'Brien, Lindsey Kwok, Luke Shingles, Marc Williamson, Mark Magee, Michael Moltenbrey, Vytautas Jancauskas + * - Ombudsperson + - Wolfgang Kerzendorf + * - Software Architect + - Alice Harpole + * - Issues / Pull Request + - Andreas Flörs + * - Continuous Integration/ Deployment / Testing + - Christian Vogl -**TARDIS Core** + +**TARDIS CORE** -- Team that oversees the activities and sets the goals for the TARDIS Collaboration -- Identifies science opportunities that match TARDIS capabilities or coordinates the addition of capabilities -- Identifies education opportunities such as workshops, lecture development, and outreach opportunities +- Team that supervises the activities and sets the goals for the TARDIS Collaboration **TARDIS GSoC Coordinators (2020)** @@ -59,7 +52,6 @@ The roles and their description can be found here: - Designated person appointed to address the concerns of community members and to uphold the code of conduct - Solicit and provide anonymized feedback to the TARDIS CORE team - Assist the TARDIS CORE team with violations of the code of conduct or other ethical concerns -- **Specifically selected as not being part of the TARDIS collaboration** **Software Architect** @@ -73,38 +65,15 @@ The roles and their description can be found here: - Monitor reviewing is taking place - Close abandoned PRs / Issues -**Continuous Integration / Deployment / Testing** +**Continuous Integration/ Deployment / Testing** - Inform team of break in any of the CI/CD pipelines - Delegate code maintenance and bug removal - Identify new technologies for CI/CD -**Funding / Financial** - -- Manage budget for TARDIS -- Ensure financial transparency -- Coordinating with funding organizations -- Securing funding for parts of the project via discussions and proposals to funding agencies - -**Science / Science Meeting / Publications** - -- Coordinating work for weekly science meeting -- Finding publications and collecting TARDIS models -- Citation guide - -**Diversity, Equity, and Inclusion** - -- Identify opportunities to use TARDIS to engage members of underrepresented minorities (URM) to coding/STEM -- Identify papers about engaging URM in coding / science - -TARDIS Alumni -============= - -The present version of TARDIS would not have been possible if not for the work of these individuals. - -Past TARDIS Core Members ---------------------------- +Past Team Members +------------ * Aoife Boyle * Michael Klauser From 3f204469205950e8debe9fe42ce8482f3077f3cb Mon Sep 17 00:00:00 2001 From: Yssa Camacho Date: Wed, 8 Jul 2020 12:15:47 -0400 Subject: [PATCH 02/10] Update team.rst - Added new GSoC students Update GSoC students section --- docs/team.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/team.rst b/docs/team.rst index d1bd3aa4f9a..1008ee34953 100644 --- a/docs/team.rst +++ b/docs/team.rst @@ -88,10 +88,10 @@ Current and Former GSoC and SOCIS Students * Tomas Bylund (SOCIS 2016) * Karan Desai (GSoC 2016) * Vaibhav Gupta (GSoC 2017) - * Vytautas Jancauskas (GSoC 2015, 2014) + * Vytautas Jancauskas (GSoC 2015) * Stefan Lietzau (GSoC 2017) * Mikhail Mishin (GSoC 2016) * Fotis Tsamis (GSoC 2016) - * Ezequiel Passaro (GSoC 2019, 2020) - * Jaladh Singhal (GSoC 2019, 2020) + * Ezequiel Passaro (GSoC 2019, GSoC 2020) + * Jaladh Singhal (GSoC 2019, GSoC 2020) * Jordi Eguren Brown (GSoC 2020) From 13291101e0700ff6ae935ce0663a98f7ea4d526e Mon Sep 17 00:00:00 2001 From: Yssa Camacho Date: Wed, 8 Jul 2020 12:23:39 -0400 Subject: [PATCH 03/10] Update team.rst - Added new roles Added new roles and minor style changes --- docs/team.rst | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/docs/team.rst b/docs/team.rst index 1008ee34953..a356c813021 100644 --- a/docs/team.rst +++ b/docs/team.rst @@ -19,22 +19,28 @@ The roles and their description can be found here: * - Roles - Person/People - * - TARDIS CORE + * - **TARDIS CORE** - Wolfgang Kerzendorf , Yssavo Camacho-Neves, Alice Harpole, Marc Williamson, Andreas Flörs, Christian Vogl, Stuart Sim, Luke Shingles, Vytautas Jancauskas - * - TARDIS GSoC Coordinators (2020) + * - **TARDIS GSoC Coordinators (2020)** - Wolfgang Kerzendorf , Yssavo Camacho-Neves, Alice Harpole, Marc Williamson - * - TARDIS GSoC Mentors (2020) + * - **TARDIS GSoC Mentors (2020)** - Alice Harpole, Andreas Flörs, Christian Vogl, Fionntan Callan, James Gillanders, Luciano G Silvestri, Stuart Sim, Wolfgang Kerzendorf, Yssavo Camacho-Neves, Andrew Fullard, Arjun Savel, Brian Cherinka, Jack O'Brien, Lindsey Kwok, Luke Shingles, Marc Williamson, Mark Magee, Michael Moltenbrey, Vytautas Jancauskas - * - Ombudsperson + * - **Ombudsperson** - Wolfgang Kerzendorf - * - Software Architect + * - **Software Architect** - Alice Harpole - * - Issues / Pull Request + * - **Issues / Pull Request** - Andreas Flörs - * - Continuous Integration/ Deployment / Testing + * - **Continuous Integration / Deployment / Testing** - Christian Vogl - + * - **Funding / Financial** + - Marc Williamson + * - **Science / Science Meeting / Publications** + - Yssavo Camacho-Neves + * - **Diversity, Equity, and Inclusion** + - Wolfgang Kerzendorf + **TARDIS CORE** - Team that supervises the activities and sets the goals for the TARDIS Collaboration @@ -65,12 +71,30 @@ The roles and their description can be found here: - Monitor reviewing is taking place - Close abandoned PRs / Issues -**Continuous Integration/ Deployment / Testing** +**Continuous Integration / Deployment / Testing** - Inform team of break in any of the CI/CD pipelines - Delegate code maintenance and bug removal - Identify new technologies for CI/CD +**Funding / Financial** + +- Manage budget for TARDIS +- Ensure financial transparency +- Coordinating with funding organizations +- Securing funding for parts of the project via discussions and proposals to funding agencies + +**Science / Science Meeting / Publications** + +- Coordinating work for weekly science meeting +- Finding publications and collecting TARDIS models +- Citation guide + +**Diversity, Equity, and Inclusion** + +- Identify opportunities to use TARDIS to engage members of underrepresented minorities (URM) to coding/STEM +- Identify papers about engaging URM in coding/science + Past Team Members ------------ From 55901cf239e476e898ecdbebc3b006dc79acc0a8 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Tue, 14 Jul 2020 10:38:04 -0400 Subject: [PATCH 04/10] add several nbsphinx related options --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 58add032b2e..e509e98253d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,7 +65,7 @@ extensions += ['matplotlib.sphinxext.plot_directive', 'sphinxcontrib.bibtex'] -nbsphinx_execute = 'auto' +nbsphinx_execute = 'never' nbsphinx_execute_arguments = [ "--InlineBackend.figure_formats={'svg', 'pdf'}", @@ -84,7 +84,7 @@ templates_path = ['_templates'] # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build', '_templates', '**.ipynb_checkpoints'] +exclude_patterns = ['_build', '_templates', '**.ipynb_checkpoints', '*.ipynb'] #exclude_patterns.append('_templates') # This is added to the end of RST files - a good place to put substitutions to From e1625d6145646d65f7c8c2a28b32d95ddbbc0d4c Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Tue, 14 Jul 2020 10:57:48 -0400 Subject: [PATCH 05/10] restructure the Governance model page --- docs/team.rst | 76 +++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/docs/team.rst b/docs/team.rst index a356c813021..a6bded68412 100644 --- a/docs/team.rst +++ b/docs/team.rst @@ -10,40 +10,40 @@ TARDIS is developed by a multidisciplinary team. We adhere to the Astropy The development of TARDIS and associated software tools are made possible through several coordination roles fulfilled by community members. This encompasses a broad scope of responsibilities ranging from direct package development to communication, distribution, and managerial activities. The roles and their description can be found here: +* **Principal Investigator** + - Wolfgang Kerzendorf +* **TARDIS CORE** [alphabetical] + - Yssavo Camacho-Neves, Andreas Flörs, Alice Harpole, Vytautas Jancauskas, Wolfgang Kerzendorf (founder), Luke Shingles, Stuart Sim (founder), Christian Vogl, Marc Williamson +* **TARDIS GSoC Coordinators (2020)** + Yssavo Camacho-Neves, Alice Harpole, Wolfgang Kerzendorf, Marc Williamson +* **TARDIS GSoC Mentors (2020)** + - Alice Harpole, Andreas Flörs, Christian Vogl, Fionntan Callan, James Gillanders, Luciano G Silvestri, Stuart Sim, Wolfgang Kerzendorf, Yssavo Camacho-Neves, Andrew Fullard, Arjun Savel, Brian Cherinka, Jack O'Brien, Lindsey Kwok, Luke Shingles, Marc Williamson, Mark Magee, Michael Moltenbrey, Vytautas Jancauskas +* **Ombudsperson** + - Michael Zingale +* **Software Architect** + - Alice Harpole +* **Issues / Pull Request** + - Andreas Flörs +* **Continuous Integration / Deployment / Testing** + - Christian Vogl +* **Funding / Financial** + - Marc Williamson +* **Science / Science Meeting / Publications** + - Yssavo Camacho-Neves +* **Diversity, Equity, and Inclusion** + - Wolfgang Kerzendorf + +** Principal Investigator ** +- Guides the scientific and the educational activities of TARDIS +- Advised by TARDIS Core -.. list-table:: - :widths: 100 100 - :header-rows: 1 - - * - Roles - - Person/People - * - **TARDIS CORE** - - Wolfgang Kerzendorf , Yssavo Camacho-Neves, Alice Harpole, Marc Williamson, Andreas Flörs, Christian Vogl, Stuart Sim, Luke Shingles, Vytautas Jancauskas - * - **TARDIS GSoC Coordinators (2020)** - - Wolfgang Kerzendorf , Yssavo Camacho-Neves, Alice Harpole, Marc Williamson - * - **TARDIS GSoC Mentors (2020)** - - Alice Harpole, Andreas Flörs, Christian Vogl, Fionntan Callan, James Gillanders, Luciano G Silvestri, Stuart Sim, Wolfgang Kerzendorf, Yssavo Camacho-Neves, Andrew Fullard, Arjun Savel, Brian Cherinka, Jack O'Brien, Lindsey Kwok, Luke Shingles, Marc Williamson, Mark Magee, Michael Moltenbrey, Vytautas Jancauskas - * - **Ombudsperson** - - Wolfgang Kerzendorf - * - **Software Architect** - - Alice Harpole - * - **Issues / Pull Request** - - Andreas Flörs - * - **Continuous Integration / Deployment / Testing** - - Christian Vogl - * - **Funding / Financial** - - Marc Williamson - * - **Science / Science Meeting / Publications** - - Yssavo Camacho-Neves - * - **Diversity, Equity, and Inclusion** - - Wolfgang Kerzendorf - - -**TARDIS CORE** +**TARDIS Core** -- Team that supervises the activities and sets the goals for the TARDIS Collaboration +- Team that oversees the activities and sets the goals for the TARDIS Collaboration +- Identifies science opportunities that match TARDIS capabilities or coordinates the addition of capabilities +- Identifies education opportunities such as workshops, lecture development, and outreach opportunities **TARDIS GSoC Coordinators (2020)** @@ -58,6 +58,7 @@ The roles and their description can be found here: - Designated person appointed to address the concerns of community members and to uphold the code of conduct - Solicit and provide anonymized feedback to the TARDIS CORE team - Assist the TARDIS CORE team with violations of the code of conduct or other ethical concerns +- Specifically selected as not being part of the core TARDIS collaboration **Software Architect** @@ -95,9 +96,14 @@ The roles and their description can be found here: - Identify opportunities to use TARDIS to engage members of underrepresented minorities (URM) to coding/STEM - Identify papers about engaging URM in coding/science +TARDIS Alumni +============= + +The present version of TARDIS would not have been possible if not for the work of these individuals. + -Past Team Members ------------- +Past TARDIS Core Members +--------------------------- * Aoife Boyle * Michael Klauser @@ -112,10 +118,10 @@ Current and Former GSoC and SOCIS Students * Tomas Bylund (SOCIS 2016) * Karan Desai (GSoC 2016) * Vaibhav Gupta (GSoC 2017) - * Vytautas Jancauskas (GSoC 2015) + * Vytautas Jancauskas (GSoC 2015, 2014) * Stefan Lietzau (GSoC 2017) * Mikhail Mishin (GSoC 2016) * Fotis Tsamis (GSoC 2016) - * Ezequiel Passaro (GSoC 2019, GSoC 2020) - * Jaladh Singhal (GSoC 2019, GSoC 2020) + * Ezequiel Passaro (GSoC 2019, 2020) + * Jaladh Singhal (GSoC 2019, 2020) * Jordi Eguren Brown (GSoC 2020) From 0c9b262ffc4fe77a8056ebfd702e1136ae5530c4 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Tue, 14 Jul 2020 11:30:17 -0400 Subject: [PATCH 06/10] re-enabled nbsphinx --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e509e98253d..58add032b2e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,7 +65,7 @@ extensions += ['matplotlib.sphinxext.plot_directive', 'sphinxcontrib.bibtex'] -nbsphinx_execute = 'never' +nbsphinx_execute = 'auto' nbsphinx_execute_arguments = [ "--InlineBackend.figure_formats={'svg', 'pdf'}", @@ -84,7 +84,7 @@ templates_path = ['_templates'] # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build', '_templates', '**.ipynb_checkpoints', '*.ipynb'] +exclude_patterns = ['_build', '_templates', '**.ipynb_checkpoints'] #exclude_patterns.append('_templates') # This is added to the end of RST files - a good place to put substitutions to From 980804a50e55334dfd9786e8a907982006c4e6db Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Tue, 14 Jul 2020 11:54:18 -0400 Subject: [PATCH 07/10] add adapted CoC --- docs/code_of_conduct.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docs/code_of_conduct.rst diff --git a/docs/code_of_conduct.rst b/docs/code_of_conduct.rst new file mode 100644 index 00000000000..74574deedf8 --- /dev/null +++ b/docs/code_of_conduct.rst @@ -0,0 +1,17 @@ +********************** +TARDIS Code of Conduct +********************** + +The TARDIS community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences success and continued growth. We expect everyone in our community to follow these guidelines when interacting with others both inside and outside of our community. Our goal is to keep ours a positive, inclusive, successful, and growing community. + +As members of the community, + +* We pledge to treat all people with respect and provide a harassment- and bullying-free environment, regardless of sex, sexual orientation and/or gender identity, disability, physical appearance, body size, race, nationality, ethnicity, and religion. In particular, sexual language and imagery, sexist, racist, or otherwise exclusionary jokes are not appropriate. +* We pledge to respect the work of others by recognizing acknowledgment/citation requests of original authors. As authors, we pledge to be explicit about how we want our own work to be cited or acknowledged. +* 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. +* This code of conduct applies to all community situations online and offline, including mailing lists, forums, social media, conferences, meetings, associated social events, and one-to-one interactions. + +Parts of this code of conduct have been adapted from the Astropy and PSF code of conduct. \ No newline at end of file From 04980f173fc7e18b59c4d8ffab85e476fbd3b1d2 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Tue, 14 Jul 2020 11:59:40 -0400 Subject: [PATCH 08/10] ammending code of conduct in the root --- CODE_OF_CONDUCT.md | 67 +++++++--------------------------------- docs/code_of_conduct.rst | 17 ---------- 2 files changed, 12 insertions(+), 72 deletions(-) delete mode 100644 docs/code_of_conduct.rst diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 5c29f5c1efd..4e9ae062a1e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,60 +1,17 @@ -# TARDIS Community Code of Conduct +******************************** +TARDIS Community Code of Conduct +******************************** -The community of participants in open source Astronomy -projects is made up of members from around the globe -with a diverse set of skills, personalities, and -experiences. It is through these differences that our -community experiences success and continued growth. -We expect everyone in our community to follow these -guidelines when interacting with others both inside -and outside of our community. Our goal is to keep ours -a positive, inclusive, successful, and growing community. +The TARDIS community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences success and continued growth. We expect everyone in our community to follow these guidelines when interacting with others both inside and outside of our community. Our goal is to keep ours a positive, inclusive, successful, and growing community. As members of the community, -* We pledge to treat all people with respect and provide -a harassment- and bullying-free environment, regardless -of sex, sexual orientation and/or gender identity, -disability, physical appearance, body size, race, -nationality, ethnicity, and religion. In particular, -sexual language and imagery, sexist, racist, or -otherwise exclusionary jokes are not appropriate. -* We pledge to respect the work of others by recognizing -acknowledgment/citation requests of original authors. As -authors, we pledge to be explicit about how we want our -own work to be cited or acknowledged. -* 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 lead developers of the TARDIS team. +* We pledge to treat all people with respect and provide a harassment- and bullying-free environment, regardless of sex, sexual orientation and/or gender identity, disability, physical appearance, body size, race, nationality, ethnicity, and religion. In particular, sexual language and imagery, sexist, racist, or otherwise exclusionary jokes are not appropriate. +* We pledge to respect the work of others by recognizing acknowledgment/citation requests of original authors. As authors, we pledge to be explicit about how we want our own work to be cited or acknowledged. +* 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. +* This code of conduct applies to all community situations online and offline, including mailing lists, forums, social media, conferences, meetings, associated social events, and one-to-one interactions. - -This code of conduct applies to all community situations online and -offline, including mailing lists, forums, social media, conferences, -meetings, associated social events, and one-to-one interactions. - -Any related activity or project organized by members of the TARDIS -community, including affiliated packages, are welcome to have their -own codes of conduct, but agree to also abide by the present code of -conduct. - -This code of conduct has been adapted from the Astropy Code of Conduct, -which in turn uses parts of the PSF code of conduct. +This code of conduct has been adapted from the Astropy Code of Conduct, which in turn uses parts of the PSF code of conduct. \ No newline at end of file diff --git a/docs/code_of_conduct.rst b/docs/code_of_conduct.rst deleted file mode 100644 index 74574deedf8..00000000000 --- a/docs/code_of_conduct.rst +++ /dev/null @@ -1,17 +0,0 @@ -********************** -TARDIS Code of Conduct -********************** - -The TARDIS community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences success and continued growth. We expect everyone in our community to follow these guidelines when interacting with others both inside and outside of our community. Our goal is to keep ours a positive, inclusive, successful, and growing community. - -As members of the community, - -* We pledge to treat all people with respect and provide a harassment- and bullying-free environment, regardless of sex, sexual orientation and/or gender identity, disability, physical appearance, body size, race, nationality, ethnicity, and religion. In particular, sexual language and imagery, sexist, racist, or otherwise exclusionary jokes are not appropriate. -* We pledge to respect the work of others by recognizing acknowledgment/citation requests of original authors. As authors, we pledge to be explicit about how we want our own work to be cited or acknowledged. -* 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. -* This code of conduct applies to all community situations online and offline, including mailing lists, forums, social media, conferences, meetings, associated social events, and one-to-one interactions. - -Parts of this code of conduct have been adapted from the Astropy and PSF code of conduct. \ No newline at end of file From 653922db83820914910b0f78ab5e875229de73cb Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Tue, 14 Jul 2020 12:04:42 -0400 Subject: [PATCH 09/10] add code of conduct --- CODE_OF_CONDUCT.md | 5 ++--- docs/index.rst | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 4e9ae062a1e..61103423a74 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,6 +1,5 @@ -******************************** -TARDIS Community Code of Conduct -******************************** +# TARDIS Community Code of Conduct # + The TARDIS community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences success and continued growth. We expect everyone in our community to follow these guidelines when interacting with others both inside and outside of our community. Our goal is to keep ours a positive, inclusive, successful, and growing community. diff --git a/docs/index.rst b/docs/index.rst index 657e2d6a3ed..a8af5ebfe92 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -85,6 +85,7 @@ Mission Statement team credits + Code of Conduct .. toctree:: From d1e3ae600bd041c0dcca922af1557303937a8546 Mon Sep 17 00:00:00 2001 From: Wolfgang Kerzendorf Date: Tue, 14 Jul 2020 16:58:58 -0400 Subject: [PATCH 10/10] getting upstream/master team.rst --- docs/team.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/team.rst b/docs/team.rst index a6bded68412..4c94a43e652 100644 --- a/docs/team.rst +++ b/docs/team.rst @@ -4,12 +4,13 @@ Team **** -TARDIS is developed by a multidisciplinary team. We adhere to the Astropy -`code of conduct `_. +TARDIS is developed by a multidisciplinary team. We adhere to our +`code of conduct `_. The development of TARDIS and associated software tools are made possible through several coordination roles fulfilled by community members. This encompasses a broad scope of responsibilities ranging from direct package development to communication, distribution, and managerial activities. The roles and their description can be found here: + * **Principal Investigator** - Wolfgang Kerzendorf * **TARDIS CORE** [alphabetical] @@ -19,7 +20,7 @@ The roles and their description can be found here: * **TARDIS GSoC Mentors (2020)** - Alice Harpole, Andreas Flörs, Christian Vogl, Fionntan Callan, James Gillanders, Luciano G Silvestri, Stuart Sim, Wolfgang Kerzendorf, Yssavo Camacho-Neves, Andrew Fullard, Arjun Savel, Brian Cherinka, Jack O'Brien, Lindsey Kwok, Luke Shingles, Marc Williamson, Mark Magee, Michael Moltenbrey, Vytautas Jancauskas * **Ombudsperson** - - Michael Zingale + - Michael Zingale (contact info on https://zingale.github.io/) * **Software Architect** - Alice Harpole * **Issues / Pull Request** @@ -34,7 +35,7 @@ The roles and their description can be found here: - Wolfgang Kerzendorf -** Principal Investigator ** +**Principal Investigator** - Guides the scientific and the educational activities of TARDIS - Advised by TARDIS Core @@ -58,7 +59,7 @@ The roles and their description can be found here: - Designated person appointed to address the concerns of community members and to uphold the code of conduct - Solicit and provide anonymized feedback to the TARDIS CORE team - Assist the TARDIS CORE team with violations of the code of conduct or other ethical concerns -- Specifically selected as not being part of the core TARDIS collaboration +- **Specifically selected as not being part of the TARDIS collaboration** **Software Architect** @@ -94,7 +95,7 @@ The roles and their description can be found here: **Diversity, Equity, and Inclusion** - Identify opportunities to use TARDIS to engage members of underrepresented minorities (URM) to coding/STEM -- Identify papers about engaging URM in coding/science +- Identify papers about engaging URM in coding / science TARDIS Alumni =============