WEB: Add diversity note to team.md #28630

dorothykiz1 · 2019-09-26T10:57:22Z

@datapythonista kindly review

web/pandas/community/team.md

datapythonista · 2019-09-26T12:59:36Z

Thanks a lot for working on this @dorothykiz1.

Looks great, couple of comments:

If you write the text after the div, not inside, you'll be able to write it in markdown, which I think will make it easier to read and maintain (and should look the same in the web
Afaik we try to use _pandas_, always lower case, and in italic. I think there are several places in the docs when it's capitalized, but in the website so far we have it consistent with this standard.
Not sure if it could make sense to mention that the diversity problem is in the open source community in general. Feels like it could contextualize a bit better the note.
Would it makes sense to also mention the code of conduct? We have zero tolerance for any sort of discrimination, besides being proactive in inclusion. Not sure if relevant here, people should feel welcome enough, but just saying
I think when we say get in touch, we should say how. I guess we can have a diversity@pandas.io in the future, linked to a Discourse group when that's set up. Do you want to create an issue for this, so we take care when we finish setting up Discourse?

The PR that I mentioned is now merged, you'll have to fix the conflict. Thanks!

web/pandas/community/team.md

dorothykiz1 · 2019-09-27T08:30:06Z

Hello, kindly re-review this and let me know in case of any suggestions

datapythonista · 2019-09-27T10:58:21Z

Thanks for the update. Can you check the file changes tab in this PR? I think you just want to add the paragraph about diversity and there are many unrelated changes.

Also, you'll have to resolve the conflicts for us to be able to merge.

I personally find the new text a bit too formal / technical. May be it's just my impression, but expressions like "systemic bias"... make me feel that if I haven't had a very tough life I'm not being encouraged to contribute. Would it make sense to have something more relaxed? Just something like "...if you'd increase the diversity of our team, we encourage you to contribute...". Making sure that people not underrepresented also feels comfortable with the note.

dorothykiz1 · 2019-09-29T16:33:53Z

Hello @datapythonista i need some help on this am failing to resolve the conflict

dorothykiz1 · 2019-09-30T08:25:31Z

@datapythonista I have worked on the needed changes but am not able to resolve the conflicts I have no write access, kindly advise.

datapythonista · 2019-09-30T11:16:30Z

You need to run git fetch upstream and then git merge upstream/master. With that git will complain, and you need to edit the files conflicting (git status to see them). When the files are as they need to be, git add them, commit, and push.

Let me know if you have any problem with that.

dorothykiz1 · 2019-09-30T13:29:24Z

Done Thank you very much, that was helpful

datapythonista

Great, the resolution of the conflicts looks perfect, and much better with markdown and the new wording.

I added some comments on the phrasing. They are just opinions, make sure that you're happy yourself with the wording and the message.

Thanks a lot for working on this. I'll ask later for feedback from other people in the mentoring team, so we make sure everybody feels the intended way after reading this paragraph. Thanks for your patience, if at any point you prefer to get this merged and improve the message in follow up pull requests (by you or someone else) just let me know.

datapythonista · 2019-09-30T23:13:53Z

web/pandas/about/index.html

@@ -84,3 +84,4 @@
 users, contributors and the broader community. Regardless of level of experience,
 gender, gender identity and expression, sexual orientation, disability,
 personal appearance, body size, race, ethnicity, age, religion, or nationality.
+


Can you remove this blank line please

datapythonista · 2019-09-30T23:14:26Z

web/pandas/about/team.md

 ## Governance

 Wes McKinney is the Benevolent Dictator for Life (BDFL).
-


Can you restore this blank line please

datapythonista · 2019-09-30T23:16:35Z

web/pandas/about/team.md

@@ -36,10 +36,19 @@ If you want to support pandas development, you can find information in the [dona
    {% endfor %}
 </div>

+
+## Diversity and Inclusion
+


There are whitespaces in some blank lines, or at the end of the ones with text. I'd recommend to set up your editor so it shows them, or warns you about them, the continuous integration of pandas checks that they don't exist.

datapythonista · 2019-09-30T23:17:01Z

web/pandas/about/team.md

+
+## Diversity and Inclusion
+
+> _pandas_ expressly welcomes and encourages anyone who faces under-representation,discrimination in the technology industry 


missing space after comma

datapythonista · 2019-09-30T23:17:18Z

web/pandas/about/team.md

+## Diversity and Inclusion
+
+> _pandas_ expressly welcomes and encourages anyone who faces under-representation,discrimination in the technology industry 
+> or anyone willing to increase the diversity of our team,we encourage you to contribute.


missing space after comma

datapythonista · 2019-09-30T23:21:58Z

web/pandas/about/team.md

+
+> _pandas_ expressly welcomes and encourages anyone who faces under-representation,discrimination in the technology industry 
+> or anyone willing to increase the diversity of our team,we encourage you to contribute.
+> We have identified the visible diversity gap and obstacles in the open source community and we are strongly against it.


My personal preference would be to phrase this as a positive message (i.e. avoid using "strongly against it"). I'd use something like "We are aware of the diversity problems in the open source community, and we are proactive in increasing the diversity of our team.". Feel free to use what you think it's better, but I think people react better to messages expressed in a positive way.

datapythonista · 2019-09-30T23:22:38Z

web/pandas/about/team.md

+> _pandas_ expressly welcomes and encourages anyone who faces under-representation,discrimination in the technology industry 
+> or anyone willing to increase the diversity of our team,we encourage you to contribute.
+> We have identified the visible diversity gap and obstacles in the open source community and we are strongly against it.
+> If you identify as any of the groups mentioned above do not hesitate to make your contribution,


I think this sentence is redundant, probably not needed.

datapythonista · 2019-09-30T23:27:48Z

web/pandas/about/team.md

+> or anyone willing to increase the diversity of our team,we encourage you to contribute.
+> We have identified the visible diversity gap and obstacles in the open source community and we are strongly against it.
+> If you identify as any of the groups mentioned above do not hesitate to make your contribution,
+> if you see a violation of our [code of conduct](https://github.com/pandas-dev/pandas/blob/master/.github/CODE_OF_CONDUCT.md) 


We have our code of conduct n the web now, you can use the link [code of conduct]({base_url}/community/coc.html) instead.

I'd probably add a bit more context about the code of conduct. Something like We have a [code of conduct](link) to ensure a friendly and welcoming environment. Please send us a message to ... if you don't feel this way.

Hello, thanks for the suggestions,
I failed to get a link to the code of conduct used what you suggested

datapythonista · 2019-09-30T23:28:02Z

web/pandas/about/team.md

+> We have identified the visible diversity gap and obstacles in the open source community and we are strongly against it.
+> If you identify as any of the groups mentioned above do not hesitate to make your contribution,
+> if you see a violation of our [code of conduct](https://github.com/pandas-dev/pandas/blob/master/.github/CODE_OF_CONDUCT.md) 
+> on this issue,please report it to the [pandas team](pandas-coc@googlegroups.com).


space after the comma

jbrockmendel · 2019-10-02T13:52:33Z

web/pandas/about/index.html

@@ -83,4 +83,4 @@
 Is in the core of _pandas_ to be respectful and welcoming with everybody,
 users, contributors and the broader community. Regardless of level of experience,
 gender, gender identity and expression, sexual orientation, disability,
-personal appearance, body size, race, ethnicity, age, religion, or nationality.
+personal appearance, body size, race, ethnicity, age, religion, or nationality.


@datapythonista do we care about getting an extra newline here?

I don't think it's important, but let's better avoid unrelated changes. Can you restore the original version of this file please?

datapythonista

Just added couple of small things, but looks good, thanks for the work on this.

Before we merge, do you mind asking for a review to your mates from the mentoring? Would be good to have different points of view on whether this achieves the expected goal.

Also, if you don't mind attaching a screenshot of how this looks rendered. That would be useful for the reviews.

datapythonista · 2019-10-02T16:39:37Z

web/pandas/about/index.html

@@ -83,4 +83,4 @@
 Is in the core of _pandas_ to be respectful and welcoming with everybody,
 users, contributors and the broader community. Regardless of level of experience,
 gender, gender identity and expression, sexual orientation, disability,
-personal appearance, body size, race, ethnicity, age, religion, or nationality.
+personal appearance, body size, race, ethnicity, age, religion, or nationality.


I don't think it's important, but let's better avoid unrelated changes. Can you restore the original version of this file please?

datapythonista · 2019-10-02T16:43:05Z

web/pandas/about/team.md

+> or anyone willing to increase the diversity of our team, we encourage you to contribute.
+> We have identified the visible diversity gap and obstacles in the open source community and we are proactive in increasing the diversity of our team.
+> We have a [code of conduct]({base_url}/community/coc.html) to ensure a friendly and welcoming environment. 
+> Please send us a message to [pandas team](pandas-coc@googlegroups.com), if you don't feel this way.


the message won't be received by the pandas team, but by the pandas code of conduct committee, so better change the link text.

Can you also add mailto: before the email address, so it becomes a mail link.

dorothykiz1 · 2019-10-03T07:38:45Z

@datapythonista am not sure on how to get the screenshot, I have sent the pull request link to the mentoring group hoping they will pass by and leave their reviews

martinagvilas · 2019-10-03T07:53:55Z

web/pandas/about/team.md

+> _pandas_ expressly welcomes and encourages anyone who faces under-representation, discrimination in the technology industry
+> or anyone willing to increase the diversity of our team, we encourage you to contribute.


It might be a matter of personal opinion, but I think the part about encouriging contributions is too far back in the sentence. I would change this phrase for something like this: pandas expressly welcomes and encourages contributions from members of underrepresented groups in technology willing to increase the diversity of our team.

Makes total sense thank you @martinagvilas for your review will fix that

Waiting for the rest of the ladies then I make a single commit

martinagvilas · 2019-10-03T10:12:48Z

web/pandas/about/team.md

@@ -38,8 +38,8 @@ If you want to support pandas development, you can find information in the [dona

 ## Diversity and Inclusion

-> _pandas_ expressly welcomes and encourages anyone who faces under-representation, discrimination in the technology industry
-> or anyone willing to increase the diversity of our team, we encourage you to contribute.
+> _pandas_ expressly welcomes and encourages contributions anyone who faces under-representation, discrimination in the technology industry


I think a from is missing after contributions

Aya-S · 2019-10-03T10:56:06Z

web/pandas/about/team.md

+> or anyone willing to increase the diversity of our team.
+> We have identified the visible diversity gap and obstacles in the open source community and we are proactive in increasing the diversity of our team.
+> We have a [code of conduct]({base_url}/community/coc.html) to ensure a friendly and welcoming environment.
+> Please send an email to [mailto:pandas-code-of-conduct-committee](pandas-coc@googlegroups.com), if you don't feel this way.


", if you don't feel this way" doesn't really flow well with me. not sure if anyone else gets the same impression. if that's the case, my suggestion for rephrasing would be " Please send an email to mailto:pandas-code-of-conduct-committee if you think we can do a better job at achieving this goal."

sara-02 · 2019-10-03T11:52:18Z

web/pandas/about/team.md

+> or anyone willing to increase the diversity of our team.
+> We have identified the visible diversity gap and obstacles in the open source community and we are proactive in increasing the diversity of our team.
+> We have a [code of conduct]({base_url}/community/coc.html) to ensure a friendly and welcoming environment.
+> Please send an email to [mailto:pandas-code-of-conduct-committee](pandas-coc@googlegroups.com), if you don't feel this way.


IDK if this is the expected behaviour but clicking on mailto gives a 404 page not found.

thanks @sara-02 ohh i get where i went wrong am i supposed to add it to the link instead?

Even I do not know, checkout this link, it provides a format github/markup#1030 (comment), in our case the subject will be different.

sara-02 · 2019-10-03T12:01:19Z

web/pandas/about/team.md

+
+> _pandas_ expressly welcomes and encourages contributions from anyone who faces under-representation, discrimination in the technology industry
+> or anyone willing to increase the diversity of our team.
+> We have identified the visible diversity gap and obstacles in the open source community and we are proactive in increasing the diversity of our team.


maybe diversity gaps or visible gaps and obstacles in sustaining diversity and inclusion in the open-source communities.
I think adding something along the lines of sustaining D&I should be inlcuded to highlight that our efforts are not one-off, but intended for long term.
WDYT?

sara-02 · 2019-10-03T12:03:37Z

@dorothykiz1 added my suggestions, hope you find them useful. :)

Aya-S · 2019-10-03T12:08:40Z

dorothykiz1 · 2019-10-03T12:40:50Z

Thank you all for taking the time to look through, I have worked on the reviews kindly re-review

Aya-S · 2019-10-03T14:19:09Z

Looks good to me! great job @dorothykiz1 following the link returned a 404in preview but when I rendered the same markup in another webpage it worked fine

martinagvilas · 2019-10-03T14:30:06Z

Looks good to me, thanks @dorothykiz1

datapythonista

Happy to get this merged if you're all happy with the text now.

Thanks a lot for working on this @dorothykiz1. Just a question. Any particular reason to have this as a quoted block (i.e. heading >)? Since this is a top level section, feels like it could be just a regular paragraph.

WillAyd · 2019-10-04T02:13:45Z

Thanks @dorothykiz1

* master: (22 commits) DOC: fix PR09,PR08 errors for pandas.Timestamp (pandas-dev#28739) WEB: Add diversity note to team.md (pandas-dev#28630) DOC: Minor fixes in pandas/testing.py docstring. (pandas-dev#28752) TST: port maybe_promote tests from pandas-dev#23982 (pandas-dev#28764) Bugfix/groupby datetime issue (pandas-dev#28569) reenable codecov (pandas-dev#28750) CLN: Centralised _check_percentile (pandas-dev#27584) DEPR: Deprecate Index.set_value (pandas-dev#28621) CLN: Fix typo in contributing.rst (pandas-dev#28761) Fixed docstring errors in pandas.period range and pandas.PeriodIndex (pandas-dev#28756) BUG: Fix TypeError raised in libreduction (pandas-dev#28643) DOC: Pandas.Series.drop docstring PR02 (pandas-dev#27976) (pandas-dev#28742) DOC: Fixed doctring errors PR08, PR09 in pandas.io (pandas-dev#28748) TST: Fix broken test cases where Timedelta/Timestamp raise (pandas-dev#28729) REF: Consolidate alignment calls in DataFrame ops (pandas-dev#28638) BUG: Fix dep generation (pandas-dev#28734) Added doctstring to fixture (pandas-dev#28727) DOC: Fixed PR06 docstrings errors in pandas.timedelta_range (pandas-dev#28719) replaced safe_import with a corresponding test decorator (pandas-dev#28731) BUG: Fix RangeIndex.get_indexer for decreasing RangeIndex (pandas-dev#28680) ...

dorothykiz1 added 2 commits September 26, 2019 13:42

Add Diversity and Inclusion note to team.md

e38c766

Add Diversity and Inclusion note to team.md

43adbf9

jreback reviewed Sep 26, 2019

View reviewed changes

web/pandas/community/team.md Outdated Show resolved Hide resolved

jorisvandenbossche changed the title ~~Add diversity note to team.md~~ WEB: Add diversity note to team.md Sep 26, 2019

jorisvandenbossche added the Web pandas website label Sep 26, 2019

Add Diversity and Inclusion note to team.md

b63a560

Add Diversty note to team.md

c66fbab

jreback added this to the 1.0 milestone Sep 26, 2019

jbrockmendel reviewed Sep 26, 2019

View reviewed changes

web/pandas/community/team.md Outdated Show resolved Hide resolved

dorothykiz1 added 2 commits September 27, 2019 11:18

**Diversity and Inclusion **

115bb8f

Add Diversity and Inclusion note to team.md

6f9d6b6

Add diversiy note

b872c7c

dorothykiz1 added 2 commits September 30, 2019 16:08

Add diversity note

64bc74d

Resolved conflicts in about/team.md file

3bd1dc6

datapythonista reviewed Sep 30, 2019

View reviewed changes

Add diversity note

2f12e8c

jbrockmendel reviewed Oct 2, 2019

View reviewed changes

datapythonista reviewed Oct 2, 2019

View reviewed changes

Add diversity note

4e4926c

martinagvilas reviewed Oct 3, 2019

View reviewed changes

Add diversity note

72dc33f

martinagvilas reviewed Oct 3, 2019

View reviewed changes

Add diversity note

b946ab1

Aya-S reviewed Oct 3, 2019

View reviewed changes

sara-02 reviewed Oct 3, 2019

View reviewed changes

Add diversity note

a1812b5

datapythonista approved these changes Oct 4, 2019

View reviewed changes

WillAyd merged commit 069e124 into pandas-dev:master Oct 4, 2019

dorothykiz1 deleted the add-diversity-note branch October 4, 2019 08:48

sara-02 mentioned this pull request Oct 30, 2019

Add note about diversity to the team page python-sprints/pandas-mentoring#168

Closed

proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019

WEB: Add diversity note to team.md (pandas-dev#28630)

fa8eb31

proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019

WEB: Add diversity note to team.md (pandas-dev#28630)

83074e7

bongolegend pushed a commit to bongolegend/pandas that referenced this pull request Jan 1, 2020

WEB: Add diversity note to team.md (pandas-dev#28630)

85e5ea7

		## Governance

		Wes McKinney is the Benevolent Dictator for Life (BDFL).


		## Diversity and Inclusion

		> _pandas_ expressly welcomes and encourages anyone who faces under-representation,discrimination in the technology industry

		> _pandas_ expressly welcomes and encourages anyone who faces under-representation, discrimination in the technology industry
		> or anyone willing to increase the diversity of our team, we encourage you to contribute.

WEB: Add diversity note to team.md #28630

WEB: Add diversity note to team.md #28630

Conversation

dorothykiz1 commented Sep 26, 2019

datapythonista commented Sep 26, 2019

dorothykiz1 commented Sep 27, 2019

datapythonista commented Sep 27, 2019

dorothykiz1 commented Sep 29, 2019 • edited Loading

dorothykiz1 commented Sep 30, 2019

datapythonista commented Sep 30, 2019

dorothykiz1 commented Sep 30, 2019

datapythonista left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

datapythonista left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dorothykiz1 commented Oct 3, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sara-02 commented Oct 3, 2019

Aya-S commented Oct 3, 2019

dorothykiz1 commented Oct 3, 2019

Aya-S commented Oct 3, 2019

martinagvilas commented Oct 3, 2019

datapythonista left a comment

Choose a reason for hiding this comment

WillAyd commented Oct 4, 2019

dorothykiz1 commented Sep 29, 2019 •

edited

Loading

dorothykiz1 commented Oct 3, 2019 •

edited

Loading