Merge pull request #14 from wangjc640/main

Update code conduct

Author: wangjc640

CONDUCT.rst

@@ -2,50 +2,66 @@
 Code of Conduct
 ---------------
 
-Our Pledge
-^^^^^^^^^^
+Purpose and principles
+^^^^^^^^^^^^^^^^^^^^^^
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+This document regulates how team-members should behavior throughout the project. We acknowledge that we should strictly follow `UBC <https://students.ubc.ca/campus-life/student-code-conduct>`_ and `MDS <https://ubc-mds.github.io/resources_pages/code_of_conduct/>`_ rules and codes of conduct. 
 
-Our Standards
-^^^^^^^^^^^^^
+Freedom of speech and diversity of opinions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Examples of behavior that contributes to creating a positive environment include:
+We see the project as an opportunity to discuss real-world issues through the lens of data science and analytics and believe that the freedom of thoughts and speech is essential to the success of this project, and higher education in general. 
+We encourage a diversity of perspectives and opinions, and candid expression and civil competition thereof, especially regarding public and social issues that potentially will become factors to be considered in the project. 
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+We appreciate the diversity of team members' personalities and backgrounds. Their gender, ethnicity, national origin, sexual orientation, and religion should be respected.   
 
-Examples of unacceptable behavior by participants include:
+Encouraged and untolerated behaviors 
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- As stipulated by UBC and MDS rules, the following behaviors are encouraged: 
 
-Our Responsibilities
-^^^^^^^^^^^^^^^^^^^^
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+1. Use welcoming and polite language
+2. Be respectful of different viewpoints and experiences
+3. Gracefully accept constructive criticism
+4. Focus on what is best for the community
+5. Show courtesy and respect towards other community members
+6. Be honest about work progress and difficulties 
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
-Scope
-^^^^^
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+- As stipulated by UBC and MDS rules, the following behaviors will not be untolerated: 
+
+
+1. written or verbal personal attacks on people based on their social and political belief, religion, gender, ethnicity, national origin, sexual orientation
+2. causing someone to fear for their safety, such as through stalking, following, or intimidation
+3. violent threats or language directed against another person
+4. the display of sexual or violent images
+5. unwelcome sexual attention and nonconsensual or unwelcome physical contact
+6. sustained disruption of talks, events, or communications
+7. insults or put-downs
+8. excessive swearing
+9. incitement to violence, suicide, or self-harm
+10. continuing to initiate interaction (including photography or recording) with someone after being asked to stop publication of private communication without consent
+
+
 
-Enforcement
-^^^^^^^^^^^
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+Consequences of untolerated behaviors 
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In case untolerated behaviors take place, team-members should be proactive in explaining to colleagues why their behavior is considered inappropriate. 
+Team-members who are asked to stop any inappropriate behavior should comply immediately. 
+If a participant engages in behavior that violates this code of conduct, team members can report it to the MDS teaching team and leadership. 
+
+Tiffany Timbers is the primary go-to person for untolerated behaviors. Team members can also escalate the complaint to Milad Maymay. 
+
+Scope
+^^^^^
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
 
 Attribution
 ^^^^^^^^^^^
-
-This Code of Conduct is adapted from the `Contributor Covenant homepage <http://contributor-covenant.org/version/1/4>`_, version 1.4.
+Derived from the `DSCI100 Code of Conduct <https://github.com/UBC-DSCI/dsci-100/blob/master/CODE_OF_CONDUCT.md>`_