Skip to content

Commit 24a5582

Browse files
committed
Merge remote-tracking branch 'upstream/main' into dep_excel_fix
# Conflicts: # doc/source/whatsnew/v2.0.0.rst
2 parents 7a96a11 + 9168fa4 commit 24a5582

File tree

138 files changed

+1276
-1845
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+1276
-1845
lines changed

doc/redirects.csv

-4
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ generated/pandas.Index.argmax,../reference/api/pandas.Index.argmax
637637
generated/pandas.Index.argmin,../reference/api/pandas.Index.argmin
638638
generated/pandas.Index.argsort,../reference/api/pandas.Index.argsort
639639
generated/pandas.Index.array,../reference/api/pandas.Index.array
640-
generated/pandas.Index.asi8,../reference/api/pandas.Index.asi8
641640
generated/pandas.Index.asof,../reference/api/pandas.Index.asof
642641
generated/pandas.Index.asof_locs,../reference/api/pandas.Index.asof_locs
643642
generated/pandas.Index.astype,../reference/api/pandas.Index.astype
@@ -662,7 +661,6 @@ generated/pandas.Index.get_indexer_non_unique,../reference/api/pandas.Index.get_
662661
generated/pandas.Index.get_level_values,../reference/api/pandas.Index.get_level_values
663662
generated/pandas.Index.get_loc,../reference/api/pandas.Index.get_loc
664663
generated/pandas.Index.get_slice_bound,../reference/api/pandas.Index.get_slice_bound
665-
generated/pandas.Index.get_value,../reference/api/pandas.Index.get_value
666664
generated/pandas.Index.groupby,../reference/api/pandas.Index.groupby
667665
generated/pandas.Index.has_duplicates,../reference/api/pandas.Index.has_duplicates
668666
generated/pandas.Index.hasnans,../reference/api/pandas.Index.hasnans
@@ -681,15 +679,13 @@ generated/pandas.Index.isin,../reference/api/pandas.Index.isin
681679
generated/pandas.Index.is_integer,../reference/api/pandas.Index.is_integer
682680
generated/pandas.Index.is_interval,../reference/api/pandas.Index.is_interval
683681
generated/pandas.Index.is_lexsorted_for_tuple,../reference/api/pandas.Index.is_lexsorted_for_tuple
684-
generated/pandas.Index.is_mixed,../reference/api/pandas.Index.is_mixed
685682
generated/pandas.Index.is_monotonic_decreasing,../reference/api/pandas.Index.is_monotonic_decreasing
686683
generated/pandas.Index.is_monotonic,../reference/api/pandas.Index.is_monotonic
687684
generated/pandas.Index.is_monotonic_increasing,../reference/api/pandas.Index.is_monotonic_increasing
688685
generated/pandas.Index.isna,../reference/api/pandas.Index.isna
689686
generated/pandas.Index.isnull,../reference/api/pandas.Index.isnull
690687
generated/pandas.Index.is_numeric,../reference/api/pandas.Index.is_numeric
691688
generated/pandas.Index.is_object,../reference/api/pandas.Index.is_object
692-
generated/pandas.Index.is_type_compatible,../reference/api/pandas.Index.is_type_compatible
693689
generated/pandas.Index.is_unique,../reference/api/pandas.Index.is_unique
694690
generated/pandas.Index.item,../reference/api/pandas.Index.item
695691
generated/pandas.Index.join,../reference/api/pandas.Index.join

doc/source/development/community.rst

+7-5
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ Any community member can open issues to:
7777
- Ask questions, e.g. "I noticed the behavior of a certain function
7878
changed between versions. Is this expected?".
7979

80-
Ideally your questions should be related to how pandas work rather
80+
Ideally, your questions should be related to how pandas works rather
8181
than how you use pandas. `StackOverflow <https://stackoverflow.com/>`_ is
8282
better suited for answering usage questions, and we ask that all usage
83-
questions are first asked on StackOverflow. Thank you for respecting are
83+
questions are first asked on StackOverflow. Thank you for respecting our
8484
time and wishes. 🙇
8585

8686
Maintainers and frequent contributors might also open issues to discuss the
8787
ongoing development of the project. For example:
8888

8989
- Report issues with the CI, GitHub Actions, or the performance of pandas
9090
- Open issues relating to the internals
91-
- Start roadmap discussion aligning on proposals what to do in future
91+
- Start roadmap discussion aligning on proposals for what to do in future
9292
releases or changes to the API.
9393
- Open issues relating to the project's website, logo, or governance
9494

@@ -97,9 +97,11 @@ The developer mailing list
9797

9898
The pandas mailing list `[email protected] <mailto://pandas-dev@python
9999
.org>`_ is used for long form
100-
conversations and to engages people in the wider community who might not
100+
conversations and to engage people in the wider community who might not
101101
be active on the issue tracker but we would like to include in discussions.
102102

103+
.. _community.slack:
104+
103105
Community slack
104106
---------------
105107

@@ -112,6 +114,6 @@ mailing list or GitHub.
112114
If this sounds like the right place for you, you are welcome to join! Email us
113115
at `[email protected] <mailto://[email protected]>`_ and let us
114116
know that you read and agree to our `Code of Conduct <https://pandas.pydata.org/community/coc.html>`_
115-
😉 to get an invite. And please remember the slack is not meant to replace the
117+
😉 to get an invite. And please remember that slack is not meant to replace the
116118
mailing list or issue tracker - all important announcements and conversations
117119
should still happen there.

doc/source/development/contributing.rst

+7-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,13 @@ assigned issues, since people may not be working in them anymore. If you want to
4545
that is assigned, feel free to kindly ask the current assignee if you can take it
4646
(please allow at least a week of inactivity before considering work in the issue discontinued).
4747

48-
Feel free to ask questions on the `mailing list
49-
<https://groups.google.com/forum/?fromgroups#!forum/pydata>`_ or on `Gitter`_.
48+
We have several :ref:`contributor community <community>` communication channels, which you are
49+
welcome to join, and ask questions as you figure things out. Among them are regular meetings for
50+
new contributors, dev meetings, a dev mailing list, and a slack for the contributor community.
51+
All pandas contributors are welcome to these spaces, where they can connect with each other. Even
52+
maintainers who have been with us for a long time felt just like you when they started out, and
53+
are happy to welcome you and support you as you get to know how we work, and where things are.
54+
Take a look at the next sections to learn more.
5055

5156
.. _contributing.bug_reports:
5257

@@ -346,8 +351,6 @@ The branch will still exist on GitHub, so to delete it there do::
346351

347352
git push origin --delete shiny-new-feature
348353

349-
.. _Gitter: https://gitter.im/pydata/pandas
350-
351354

352355
Tips for a successful pull request
353356
==================================

doc/source/development/contributing_environment.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ installed (or you wish to install a newer version) you can install a compiler
9595
For other Linux distributions, consult your favorite search engine for
9696
compiler installation instructions.
9797

98-
Let us know if you have any difficulties by opening an issue or reaching out on `Gitter <https://gitter.im/pydata/pandas/>`_.
98+
Let us know if you have any difficulties by opening an issue or reaching out on our contributor
99+
community :ref:`Slack <community.slack>`.
99100

100101
.. _contributing.mamba:
101102

0 commit comments

Comments
 (0)