Skip to content

Commit 1a35178

Browse files
Merge branch 'master' into patch_for_15520
2 parents b3c2fbb + 4ca4fca commit 1a35178

File tree

279 files changed

+9356
-7359
lines changed

Some content is hidden

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

279 files changed

+9356
-7359
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,5 @@ doc/source/index.rst
103103
doc/build/html/index.html
104104
# Windows specific leftover:
105105
doc/tmp.sv
106+
doc/source/styled.xlsx
106107
doc/source/templates/

asv_bench/benchmarks/algorithms.py

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1+
from importlib import import_module
2+
13
import numpy as np
4+
25
import pandas as pd
36
from pandas.util import testing as tm
47

5-
try:
6-
from pandas.tools.hashing import hash_pandas_object
7-
except ImportError:
8-
pass
9-
8+
for imp in ['pandas.util.hashing', 'pandas.tools.hashing']:
9+
try:
10+
hashing = import_module(imp)
11+
break
12+
except:
13+
pass
1014

1115
class Algorithms(object):
1216
goal_time = 0.2
@@ -108,13 +112,13 @@ def setup(self):
108112
self.df.iloc[10:20] = np.nan
109113

110114
def time_frame(self):
111-
hash_pandas_object(self.df)
115+
hashing.hash_pandas_object(self.df)
112116

113117
def time_series_int(self):
114-
hash_pandas_object(self.df.E)
118+
hashing.hash_pandas_object(self.df.E)
115119

116120
def time_series_string(self):
117-
hash_pandas_object(self.df.B)
121+
hashing.hash_pandas_object(self.df.B)
118122

119123
def time_series_categorical(self):
120-
hash_pandas_object(self.df.C)
124+
hashing.hash_pandas_object(self.df.C)

doc/source/_static/style-excel.png

56.8 KB
Loading

doc/source/api.rst

+44-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@
55
API Reference
66
*************
77

8+
This page gives an overview of all public pandas objects, functions and
9+
methods. In general, all classes and functions exposed in the top-level
10+
``pandas.*`` namespace are regarded as public.
11+
12+
Further some of the subpackages are public, including ``pandas.errors``,
13+
``pandas.plotting``, and ``pandas.testing``. Certain functions in the the
14+
``pandas.io`` and ``pandas.tseries`` submodules are public as well (those
15+
mentioned in the documentation). Further, the ``pandas.api.types`` subpackage
16+
holds some public functions related to data types in pandas.
17+
18+
19+
.. warning::
20+
21+
The ``pandas.core``, ``pandas.compat``, and ``pandas.util`` top-level modules are considered to be PRIVATE. Stability of functionality in those modules in not guaranteed.
22+
23+
824
.. _api.functions:
925

1026
Input/Output
@@ -1761,7 +1777,7 @@ The following methods are available only for ``DataFrameGroupBy`` objects.
17611777

17621778
Resampling
17631779
----------
1764-
.. currentmodule:: pandas.tseries.resample
1780+
.. currentmodule:: pandas.core.resample
17651781

17661782
Resampler objects are returned by resample calls: :func:`pandas.DataFrame.resample`, :func:`pandas.Series.resample`.
17671783

@@ -1896,3 +1912,30 @@ Testing functions
18961912
testing.assert_frame_equal
18971913
testing.assert_series_equal
18981914
testing.assert_index_equal
1915+
1916+
1917+
Exceptions and warnings
1918+
~~~~~~~~~~~~~~~~~~~~~~~
1919+
1920+
.. autosummary::
1921+
:toctree: generated/
1922+
1923+
errors.DtypeWarning
1924+
errors.EmptyDataError
1925+
errors.OutOfBoundsDatetime
1926+
errors.ParserError
1927+
errors.ParserWarning
1928+
errors.PerformanceWarning
1929+
errors.UnsortedIndexError
1930+
errors.UnsupportedFunctionCall
1931+
1932+
1933+
Data types related functionality
1934+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1935+
1936+
.. autosummary::
1937+
:toctree: generated/
1938+
1939+
api.types.union_categoricals
1940+
api.types.infer_dtype
1941+
api.types.pandas_dtype

0 commit comments

Comments
 (0)