Skip to content

Commit eeb0d59

Browse files
Merge remote-tracking branch 'upstream/master' into bisect
2 parents e994627 + 2b4bcf2 commit eeb0d59

Some content is hidden

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

55 files changed

+2030
-1839
lines changed

asv_bench/benchmarks/frame_methods.py

+13
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,19 @@ def time_frame_quantile(self, axis):
597597
self.df.quantile([0.1, 0.5], axis=axis)
598598

599599

600+
class Rank:
601+
param_names = ["dtype"]
602+
params = [
603+
["int", "uint", "float", "object"],
604+
]
605+
606+
def setup(self, dtype):
607+
self.df = DataFrame(np.random.randn(10000, 10), columns=range(10), dtype=dtype)
608+
609+
def time_rank(self, dtype):
610+
self.df.rank()
611+
612+
600613
class GetDtypeCounts:
601614
# 2807
602615
def setup(self):

asv_bench/benchmarks/groupby.py

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"skew",
3030
"cumprod",
3131
"cummax",
32-
"rank",
3332
"pct_change",
3433
"min",
3534
"var",

asv_bench/benchmarks/series_methods.py

+14
Original file line numberDiff line numberDiff line change
@@ -349,4 +349,18 @@ def time_func(self, func, N, dtype):
349349
self.func()
350350

351351

352+
class Rank:
353+
354+
param_names = ["dtype"]
355+
params = [
356+
["int", "uint", "float", "object"],
357+
]
358+
359+
def setup(self, dtype):
360+
self.s = Series(np.random.randint(0, 1000, size=100000), dtype=dtype)
361+
362+
def time_rank(self, dtype):
363+
self.s.rank()
364+
365+
352366
from .pandas_vb_common import setup # noqa: F401 isort:skip

doc/source/conf.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@
6868
"contributors", # custom pandas extension
6969
]
7070

71-
exclude_patterns = ["**.ipynb_checkpoints"]
71+
exclude_patterns = [
72+
"**.ipynb_checkpoints",
73+
# to ensure that include files (partial pages) aren't built, exclude them
74+
# https://github.com/sphinx-doc/sphinx/issues/1965#issuecomment-124732907
75+
"**/includes/**",
76+
]
7277
try:
7378
import nbconvert
7479
except ImportError:

doc/source/getting_started/intro_tutorials/02_read_write.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ul class="list-group list-group-flush">
1818
<li class="list-group-item">
1919

20-
.. include:: titanic.rst
20+
.. include:: includes/titanic.rst
2121

2222
.. raw:: html
2323

doc/source/getting_started/intro_tutorials/03_subset_data.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ul class="list-group list-group-flush">
1818
<li class="list-group-item">
1919

20-
.. include:: titanic.rst
20+
.. include:: includes/titanic.rst
2121

2222
.. ipython:: python
2323

doc/source/getting_started/intro_tutorials/04_plotting.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ul class="list-group list-group-flush">
1919
<li class="list-group-item">
2020

21-
. include:: air_quality_no2.rst
21+
.. include:: includes/air_quality_no2.rst
2222

2323
.. ipython:: python
2424

doc/source/getting_started/intro_tutorials/05_add_columns.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ul class="list-group list-group-flush">
1818
<li class="list-group-item">
1919

20-
. include:: air_quality_no2.rst
20+
.. include:: includes/air_quality_no2.rst
2121

2222
.. ipython:: python
2323

doc/source/getting_started/intro_tutorials/06_calculate_statistics.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ul class="list-group list-group-flush">
1818
<li class="list-group-item">
1919

20-
.. include:: titanic.rst
20+
.. include:: includes/titanic.rst
2121

2222
.. ipython:: python
2323

doc/source/getting_started/intro_tutorials/07_reshape_table_layout.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ul class="list-group list-group-flush">
1818
<li class="list-group-item">
1919

20-
.. include:: titanic.rst
20+
.. include:: includes/titanic.rst
2121

2222
.. ipython:: python
2323

doc/source/getting_started/intro_tutorials/10_text_data.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</div>
1717
<ul class="list-group list-group-flush">
1818
<li class="list-group-item">
19-
.. include:: titanic.rst
19+
.. include:: includes/titanic.rst
2020

2121
.. ipython:: python
2222

doc/source/getting_started/intro_tutorials/air_quality_no2.rst renamed to doc/source/getting_started/intro_tutorials/includes/air_quality_no2.rst

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
:orphan:
2-
31
.. raw:: html
42

53
<div data-toggle="collapse" href="#collapsedata" role="button" aria-expanded="false" aria-controls="collapsedata">

doc/source/getting_started/intro_tutorials/titanic.rst renamed to doc/source/getting_started/intro_tutorials/includes/titanic.rst

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
:orphan:
2-
31
.. raw:: html
42

53
<div data-toggle="collapse" href="#collapsedata" role="button" aria-expanded="false" aria-controls="collapsedata">

doc/source/whatsnew/v1.3.0.rst

+4-3
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ Datetimelike
190190
^^^^^^^^^^^^
191191
- Bug in :class:`DataFrame` and :class:`Series` constructors sometimes dropping nanoseconds from :class:`Timestamp` (resp. :class:`Timedelta`) ``data``, with ``dtype=datetime64[ns]`` (resp. ``timedelta64[ns]``) (:issue:`38032`)
192192
- Bug in :meth:`DataFrame.first` and :meth:`Series.first` returning two months for offset one month when first day is last calendar day (:issue:`29623`)
193-
- Bug in constructing a :class:`DataFrame` or :class:`Series` with mismatched ``datetime64`` data and ``timedelta64`` dtype, or vice-versa, failing to raise ``TypeError`` (:issue:`38575`, :issue:`38764`)
193+
- Bug in constructing a :class:`DataFrame` or :class:`Series` with mismatched ``datetime64`` data and ``timedelta64`` dtype, or vice-versa, failing to raise ``TypeError`` (:issue:`38575`, :issue:`38764`, :issue:`38792`)
194+
- Bug in constructing a :class:`Series` or :class:`DataFrame` with a ``datetime`` object out of bounds for ``datetime64[ns]`` dtype (:issue:`38792`)
194195
- Bug in :meth:`DatetimeIndex.intersection`, :meth:`DatetimeIndex.symmetric_difference`, :meth:`PeriodIndex.intersection`, :meth:`PeriodIndex.symmetric_difference` always returning object-dtype when operating with :class:`CategoricalIndex` (:issue:`38741`)
195196
- Bug in :meth:`Series.where` incorrectly casting ``datetime64`` values to ``int64`` (:issue:`37682`)
196197
-
@@ -284,13 +285,13 @@ Plotting
284285
Groupby/resample/rolling
285286
^^^^^^^^^^^^^^^^^^^^^^^^
286287

287-
-
288+
- Bug in :meth:`SeriesGroupBy.value_counts` where unobserved categories in a grouped categorical series were not tallied (:issue:`38672`)
288289
-
289290

290291
Reshaping
291292
^^^^^^^^^
292293

293-
-
294+
- Bug in :meth:`DataFrame.unstack` with missing levels led to incorrect index names (:issue:`37510`)
294295
-
295296

296297
Sparse

0 commit comments

Comments
 (0)