Merge pull request #1863 from learningequality/add-code-of-conduct-1

Code of Conduct template

Author: benjaoming

CODE_OF_CONDUCT.rst

@@ -0,0 +1,157 @@
+Code of Conduct
+===============
+
+1. Purpose
+----------
+
+A primary goal of Kolibri and KA Lite is to be inclusive to the largest
+number of contributors, with the most varied and diverse backgrounds
+possible. As such, we are committed to providing a friendly, safe and
+welcoming environment for all, regardless of gender, sexual orientation,
+ability, ethnicity, socioeconomic status, and religion (or lack
+thereof).
+
+This code of conduct outlines our expectations for all those who
+participate in our community, as well as the consequences for
+unacceptable behavior.
+
+We invite all those who participate in Kolibri or KA Lite to help us
+create safe and positive experiences for everyone.
+
+2. Open Source Citizenship
+--------------------------
+
+A supplemental goal of this Code of Conduct is to increase open source
+citizenship by encouraging participants to recognize and strengthen the
+relationships between our actions and their effects on our community.
+
+Communities mirror the societies in which they exist and positive action
+is essential to counteract the many forms of inequality and abuses of
+power that exist in society.
+
+If you see someone who is making an extra effort to ensure our community
+is welcoming, friendly, and encourages all participants to contribute to
+the fullest extent, we also want to know!
+
+3. Expected Behavior
+--------------------
+
+The following behaviors are expected and requested of all community
+members:
+
+-  Participate in an authentic and active way. In doing so, you
+   contribute to the health and longevity of this community.
+-  Exercise consideration and respect in your speech and actions.
+-  Attempt collaboration before conflict.
+-  Refrain from demeaning, discriminatory, or harassing behavior and
+   speech.
+-  Be mindful of your surroundings and of your fellow participants.
+   Alert community leaders if you notice a dangerous situation, someone
+   in distress, or violations of this Code of Conduct, even if they seem
+   inconsequential.
+-  Remember that community event venues may be shared with members of
+   the public; please be respectful to all patrons of these locations.
+
+4. Unacceptable Behavior
+------------------------
+
+The following behaviors are considered harassment and are unacceptable
+within our community:
+
+-  Violence, threats of violence or violent language directed against
+   another person.
+-  Sexist, racist, homophobic, transphobic, ableist or otherwise
+   discriminatory jokes and language.
+-  Posting or displaying sexually explicit or violent material.
+-  Posting or threatening to post other people’s personally identifying
+   information ("doxing").
+-  Personal insults, particularly those related to gender, sexual
+   orientation, race, religion, or disability.
+-  Inappropriate photography or recording.
+-  Inappropriate physical contact. You should have someone’s consent
+   before touching them.
+-  Unwelcome sexual attention. This includes, sexualized comments or
+   jokes; inappropriate touching, groping, and unwelcomed sexual
+   advances.
+-  Deliberate intimidation, stalking or following (online or in person).
+-  Advocating for, or encouraging, any of the above behavior.
+-  Sustained disruption of community events, including talks and
+   presentations.
+
+5. Consequences of Unacceptable Behavior
+----------------------------------------
+
+Unacceptable behavior from any community member, including sponsors and
+those with decision-making authority, will not be tolerated.
+
+Anyone asked to stop unacceptable behavior is expected to comply
+immediately.
+
+If a community member engages in unacceptable behavior, the community
+organizers may take any action they deem appropriate, up to and
+including a temporary ban or permanent expulsion from the community
+without warning (and without refund in the case of a paid event).
+
+6. Reporting Guidelines
+-----------------------
+
+If you are subject to or witness unacceptable behavior, or have any
+other concerns, please notify a community organizer as soon as possible.
+[email protected].
+
+`Reporting
+Guidelines <http://kolibri.readthedocs.io/en/develop/contributing.html#code-of-conduct>`__
+
+Additionally, community organizers are available to help community
+members engage with local law enforcement or to otherwise help those
+experiencing unacceptable behavior feel safe. In the context of
+in-person events, organizers will also provide escorts as desired by the
+person experiencing distress.
+
+7. Addressing Grievances
+------------------------
+
+If you feel you have been falsely or unfairly accused of violating this
+Code of Conduct, you should notify Learning Equality with a concise
+description of your grievance. Your grievance will be handled in
+accordance with our existing governing policies.
+
+`Enforcement Manual <http://kolibri.readthedocs.io/en/develop/contributing.html#code-of-conduct>`__
+
+8. Scope
+--------
+
+We expect all community participants (contributors, paid or otherwise;
+sponsors; and other guests) to abide by this Code of Conduct in all
+community venues–online and in-person–as well as in all one-on-one
+communications pertaining to community business.
+
+This code of conduct and its related procedures also applies to
+unacceptable behavior occurring outside the scope of community
+activities when such behavior has the potential to adversely affect the
+safety and well-being of community members.
+
+9. Contact info
+---------------
+
+The Code of Conduct team consists of:
+  
+ * Benjamin Bach ([email protected])
+ * Radina Matic ([email protected])
+ * Richard Tibbles ([email protected])
+
+Please write: [email protected]
+
+10. License and attribution
+---------------------------
+
+This Code of Conduct is distributed under a `Creative Commons
+Attribution-ShareAlike
+license <http://creativecommons.org/licenses/by-sa/3.0/>`__.
+
+Portions of text derived from the `Django Code of
+Conduct <https://www.djangoproject.com/conduct/>`__ and the `Geek
+Feminism Anti-Harassment
+Policy <http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy>`__.
+
+Retrieved on November 22, 2016 from http://citizencodeofconduct.org/

CONTRIBUTING.rst

@@ -1,4 +1,3 @@
-
 Contributing
 ============
 
@@ -93,54 +92,18 @@ Pull Request Guidelines
 Before you submit a pull request, check that it meets these guidelines:
 
 1. For your pull request description on Github, consider using our
-   template, see :ref:`prtemplate`.
+   template.
 2. Remember to add yourself to ``AUTHORS.rst`` and fill in ``CHANGELOG.rst``
    with your feature or bug fix.
 3. The pull request should include tests.
 4. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-5. The pull request should work for Python 2.7, 3.4, and 3.5, and for PyPy.
+5. The pull request should work for Python 2.7, 3.4, and 3.5, 3.6, and for PyPy.
    PRs will be automatically tested, we recommend running the ``tox`` command
    locally before submitting your PR for review.
 
 
-.. _prtemplate:
-
-Pull Request Template
-~~~~~~~~~~~~~~~~~~~~~
-
-Copy-paste the following to your Pull Request description on Github::
-
-    ## Summary
-
-    *Short description*
-
-    ## TODO
-
-    - [ ] Have tests been written for the new code?
-    - [ ] Has documentation been written/updated?
-    - [ ] New dependencies (if any) added to requirements file
-    - [ ] Add an entry to CHANGELOG.rst
-    - [ ] Add yourself it AUTHORS.rst if you don't appear there
-
-    ## Reviewer guidance
-
-    *If you PR has a significant size, give the reviewer some helpful remarks*
-
-    ## Issues addressed
-
-    List the issues solved or partly solved by the PR
-
-    ## Documentation
-
-    If the PR has documentation, link the file here (either .rst in your repo or if built on Read The Docs)
-
-    ## Screenshots (if appropriate)
-
-    They're nice. :)
-
-
 Tips
 ----
 

README.rst

@@ -63,6 +63,7 @@ How can I contribute?
   *Please start by:*
 
 * Reading our `Developer Documentation <http://kolibri.readthedocs.io/en/develop/dev/getting_started.html>`_ available online, and in the ``docs/`` directory.
-* Contacting us on the Mailing list: `Google groups <https://groups.google.com/a/learningequality.org/forum/#!forum/dev>`_.
+* Get support in our `Support Community <http://community.learningequality.org/>`_.
+* Sign up to receive developer announcements: `Google groups <https://groups.google.com/a/learningequality.org/forum/#!forum/dev>`_.
 * or via IRC: #kolibri on Freenode.
 

SUPPORT.rst

@@ -0,0 +1,9 @@
+Getting Support
+===============
+
+Please use our community support forum:
+
+http://community.learningequality.org/
+
+We do not accept support questions in Github issues, unless you think
+your problem is due to an error in the project itself.