Skip to content

Commit 1e837f7

Browse files
committed
Merge branch 'master' into misc/remove-docs
2 parents 431dec8 + 2b4bcf2 commit 1e837f7

Some content is hidden

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

67 files changed

+2128
-1902
lines changed

asv_bench/benchmarks/frame_methods.py

Lines changed: 13 additions & 0 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 14 additions & 0 deletions
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

Lines changed: 6 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)