Skip to content

Commit b5f77b1

Browse files
authored
Merge branch 'main' into issue-50977
2 parents 94e3ce2 + 0cedcbf commit b5f77b1

File tree

178 files changed

+2292
-2063
lines changed

Some content is hidden

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

178 files changed

+2292
-2063
lines changed

.github/actions/setup-conda/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
1919
run: |
2020
grep -q ' - pyarrow' ${{ inputs.environment-file }}
21-
sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
21+
sed -i"" -e "s/ - pyarrow<11/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
2222
cat ${{ inputs.environment-file }}
2323
shell: bash
2424
if: ${{ inputs.pyarrow-version }}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ repos:
135135
types: [python]
136136
stages: [manual]
137137
additional_dependencies: &pyright_dependencies
138-
138+
139139
- id: pyright_reportGeneralTypeIssues
140140
# note: assumes python env is setup and activated
141141
name: pyright reportGeneralTypeIssues
142-
entry: pyright --skipunannotated -p pyright_reportGeneralTypeIssues.json
142+
entry: pyright --skipunannotated -p pyright_reportGeneralTypeIssues.json --level warning
143143
language: node
144144
pass_filenames: false
145145
types: [python]

ci/code_checks.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
187187
pandas.show_versions \
188188
pandas.test \
189189
pandas.NaT \
190-
pandas.Timestamp.unit \
191190
pandas.Timestamp.as_unit \
192191
pandas.Timestamp.ctime \
193192
pandas.Timestamp.date \
@@ -579,22 +578,16 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
579578

580579
MSG='Partially validate docstrings (EX02)' ; echo $MSG
581580
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX02 --ignore_functions \
582-
pandas.DataFrame.copy \
583581
pandas.DataFrame.plot.line \
584-
pandas.DataFrame.std \
585-
pandas.DataFrame.var \
586582
pandas.Index.factorize \
587583
pandas.Period.strftime \
588-
pandas.Series.copy \
589584
pandas.Series.factorize \
590585
pandas.Series.floordiv \
591586
pandas.Series.plot.line \
592587
pandas.Series.rfloordiv \
593588
pandas.Series.sparse.density \
594589
pandas.Series.sparse.npoints \
595590
pandas.Series.sparse.sp_values \
596-
pandas.Series.std \
597-
pandas.Series.var \
598591
pandas.Timestamp.fromtimestamp \
599592
pandas.api.types.infer_dtype \
600593
pandas.api.types.is_bool_dtype \

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
- psycopg2
4343
- pymysql
4444
- pytables
45-
- pyarrow
45+
- pyarrow<11
4646
- pyreadstat
4747
- python-snappy
4848
- pyxlsb

ci/deps/actions-311.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
- psycopg2
4343
- pymysql
4444
# - pytables>=3.8.0 # first version that supports 3.11
45-
- pyarrow
45+
- pyarrow<11
4646
- pyreadstat
4747
- python-snappy
4848
- pyxlsb

ci/deps/actions-38-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- openpyxl
4141
- odfpy
4242
- psycopg2
43-
- pyarrow
43+
- pyarrow<11
4444
- pymysql
4545
- pyreadstat
4646
- pytables

ci/deps/actions-38.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- odfpy
4141
- pandas-gbq
4242
- psycopg2
43-
- pyarrow
43+
- pyarrow<11
4444
- pymysql
4545
- pyreadstat
4646
- pytables

ci/deps/actions-39.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies:
4141
- pandas-gbq
4242
- psycopg2
4343
- pymysql
44-
- pyarrow
44+
- pyarrow<11
4545
- pyreadstat
4646
- pytables
4747
- python-snappy

ci/deps/circle-38-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- odfpy
4141
- pandas-gbq
4242
- psycopg2
43-
- pyarrow
43+
- pyarrow<11
4444
- pymysql
4545
# Not provided on ARM
4646
#- pyreadstat

doc/source/development/internals.rst

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,21 @@ Indexing
1515
In pandas there are a few objects implemented which can serve as valid
1616
containers for the axis labels:
1717

18-
* ``Index``: the generic "ordered set" object, an ndarray of object dtype
18+
* :class:`Index`: the generic "ordered set" object, an ndarray of object dtype
1919
assuming nothing about its contents. The labels must be hashable (and
2020
likely immutable) and unique. Populates a dict of label to location in
2121
Cython to do ``O(1)`` lookups.
22-
* ``Int64Index``: a version of ``Index`` highly optimized for 64-bit integer
23-
data, such as time stamps
24-
* ``Float64Index``: a version of ``Index`` highly optimized for 64-bit float data
25-
* ``MultiIndex``: the standard hierarchical index object
26-
* ``DatetimeIndex``: An Index object with ``Timestamp`` boxed elements (impl are the int64 values)
27-
* ``TimedeltaIndex``: An Index object with ``Timedelta`` boxed elements (impl are the in64 values)
28-
* ``PeriodIndex``: An Index object with Period elements
22+
* :class:`MultiIndex`: the standard hierarchical index object
23+
* :class:`DatetimeIndex`: An Index object with :class:`Timestamp` boxed elements (impl are the int64 values)
24+
* :class:`TimedeltaIndex`: An Index object with :class:`Timedelta` boxed elements (impl are the in64 values)
25+
* :class:`PeriodIndex`: An Index object with Period elements
2926

3027
There are functions that make the creation of a regular index easy:
3128

32-
* ``date_range``: fixed frequency date range generated from a time rule or
29+
* :func:`date_range`: fixed frequency date range generated from a time rule or
3330
DateOffset. An ndarray of Python datetime objects
34-
* ``period_range``: fixed frequency date range generated from a time rule or
35-
DateOffset. An ndarray of ``Period`` objects, representing timespans
31+
* :func:`period_range`: fixed frequency date range generated from a time rule or
32+
DateOffset. An ndarray of :class:`Period` objects, representing timespans
3633

3734
The motivation for having an ``Index`` class in the first place was to enable
3835
different implementations of indexing. This means that it's possible for you,
@@ -43,28 +40,28 @@ From an internal implementation point of view, the relevant methods that an
4340
``Index`` must define are one or more of the following (depending on how
4441
incompatible the new object internals are with the ``Index`` functions):
4542

46-
* ``get_loc``: returns an "indexer" (an integer, or in some cases a
43+
* :meth:`~Index.get_loc`: returns an "indexer" (an integer, or in some cases a
4744
slice object) for a label
48-
* ``slice_locs``: returns the "range" to slice between two labels
49-
* ``get_indexer``: Computes the indexing vector for reindexing / data
45+
* :meth:`~Index.slice_locs`: returns the "range" to slice between two labels
46+
* :meth:`~Index.get_indexer`: Computes the indexing vector for reindexing / data
5047
alignment purposes. See the source / docstrings for more on this
51-
* ``get_indexer_non_unique``: Computes the indexing vector for reindexing / data
48+
* :meth:`~Index.get_indexer_non_unique`: Computes the indexing vector for reindexing / data
5249
alignment purposes when the index is non-unique. See the source / docstrings
5350
for more on this
54-
* ``reindex``: Does any pre-conversion of the input index then calls
51+
* :meth:`~Index.reindex`: Does any pre-conversion of the input index then calls
5552
``get_indexer``
56-
* ``union``, ``intersection``: computes the union or intersection of two
53+
* :meth:`~Index.union`, :meth:`~Index.intersection`: computes the union or intersection of two
5754
Index objects
58-
* ``insert``: Inserts a new label into an Index, yielding a new object
59-
* ``delete``: Delete a label, yielding a new object
60-
* ``drop``: Deletes a set of labels
61-
* ``take``: Analogous to ndarray.take
55+
* :meth:`~Index.insert`: Inserts a new label into an Index, yielding a new object
56+
* :meth:`~Index.delete`: Delete a label, yielding a new object
57+
* :meth:`~Index.drop`: Deletes a set of labels
58+
* :meth:`~Index.take`: Analogous to ndarray.take
6259

6360
MultiIndex
6461
~~~~~~~~~~
6562

66-
Internally, the ``MultiIndex`` consists of a few things: the **levels**, the
67-
integer **codes** (until version 0.24 named *labels*), and the level **names**:
63+
Internally, the :class:`MultiIndex` consists of a few things: the **levels**, the
64+
integer **codes**, and the level **names**:
6865

6966
.. ipython:: python
7067
@@ -80,13 +77,13 @@ You can probably guess that the codes determine which unique element is
8077
identified with that location at each layer of the index. It's important to
8178
note that sortedness is determined **solely** from the integer codes and does
8279
not check (or care) whether the levels themselves are sorted. Fortunately, the
83-
constructors ``from_tuples`` and ``from_arrays`` ensure that this is true, but
84-
if you compute the levels and codes yourself, please be careful.
80+
constructors :meth:`~MultiIndex.from_tuples` and :meth:`~MultiIndex.from_arrays` ensure
81+
that this is true, but if you compute the levels and codes yourself, please be careful.
8582

8683
Values
8784
~~~~~~
8885

89-
pandas extends NumPy's type system with custom types, like ``Categorical`` or
86+
pandas extends NumPy's type system with custom types, like :class:`Categorical` or
9087
datetimes with a timezone, so we have multiple notions of "values". For 1-D
9188
containers (``Index`` classes and ``Series``) we have the following convention:
9289

0 commit comments

Comments
 (0)