Skip to content

Commit 9a51574

Browse files
committed
Merge commit 'v0.16.1-97-gbc7d48f' into debian
* commit 'v0.16.1-97-gbc7d48f': (56 commits) disable some deps on 3.2 build Fix meantim typo DOC: use current ipython in doc build PERF: write basic datetimes faster pandas-dev#10271 TST: fix for bottleneck >= 1.0 nansum behavior, xref pandas-dev#9422 add numba example to enhancingperf.rst BUG: SparseSeries constructor ignores input data name BUG: Raise TypeError only if key DataFrame is not empty pandas-dev#10126 ENH: groupby.apply for Categorical should preserve categories (closes pandas-dev#10138) DOC: add in whatsnew/0.17.0.txt DOC: move whatsnew from 0.17.0 -> 0.16.2 BUG: Holiday(..) with both offset and observance raises NotImplementedError pandas-dev#10217 BUG: Index.union cannot handle array-likes BUG: SparseSeries.abs() resets name BUG: Series arithmetic methods incorrectly hold name ENH: Don't infer WOM-5MON if we don't support it (pandas-dev#9425) BUG: Series.align resets name when fill_value is specified BUG: GroupBy.get_group raises ValueError when group key contains NaT Close mysql connection in TestXMySQL to prevent tests freezing BUG: plot doesnt default to matplotlib axes.grid setting (pandas-dev#9792) ...
2 parents 6c6e64d + bc7d48f commit 9a51574

Some content is hidden

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

87 files changed

+1797
-800
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ conda install pandas
123123
- xlrd >= 0.9.0
124124
- [XlsxWriter](https://pypi.python.org/pypi/XlsxWriter)
125125
- Alternative Excel writer.
126-
- [Google bq Command Line Tool](https://developers.google.com/bigquery/bq-command-line-tool/)
126+
- [Google bq Command Line Tool](https://cloud.google.com/bigquery/bq-command-line-tool)
127127
- Needed for `pandas.io.gbq`
128128
- [boto](https://pypi.python.org/pypi/boto): necessary for Amazon S3 access.
129129
- One of the following combinations of libraries is needed to use the

ci/build_docs.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ fi
1313

1414

1515
if [ x"$DOC_BUILD" != x"" ]; then
16-
# we're running network tests, let's build the docs in the meantim
16+
17+
# we're running network tests, let's build the docs in the meantime
1718
echo "Will build docs"
18-
pip install sphinx==1.1.3 ipython==1.1.0
19+
conda install sphinx==1.1.3 ipython
1920

2021
mv "$TRAVIS_BUILD_DIR"/doc /tmp
2122
cd /tmp/doc

ci/requirements-3.2.txt

-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
python-dateutil==2.1
22
pytz==2013b
3-
xlsxwriter==0.4.6
4-
xlrd==0.9.2
53
numpy==1.7.1
64
cython==0.19.1
7-
numexpr==2.1
8-
tables==3.0.0
9-
matplotlib==1.2.1
10-
patsy==0.1.0
11-
lxml==3.2.1
12-
html5lib
13-
scipy==0.12.0
14-
beautifulsoup4==4.2.1
15-
statsmodels==0.5.0
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{{ fullname }}
2+
{{ underline }}
3+
4+
.. currentmodule:: {{ module.split('.')[0] }}
5+
6+
.. automethod:: {{ [module.split('.')[1], objname]|join('.') }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{{ fullname }}
2+
{{ underline }}
3+
4+
.. currentmodule:: {{ module }}
5+
6+
.. autoclass:: {{ objname }}

doc/source/10min.rst

+11-13
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
:suppress:
77
88
import numpy as np
9-
import random
9+
import pandas as pd
1010
import os
1111
np.random.seed(123456)
12-
from pandas import options
13-
import pandas as pd
1412
np.set_printoptions(precision=4, suppress=True)
1513
import matplotlib
1614
try:
1715
matplotlib.style.use('ggplot')
1816
except AttributeError:
19-
options.display.mpl_style = 'default'
20-
options.display.max_rows=15
17+
pd.options.display.mpl_style = 'default'
18+
pd.options.display.max_rows = 15
2119
2220
#### portions of this were borrowed from the
2321
#### Pandas cheatsheet
@@ -298,7 +296,7 @@ Using the :func:`~Series.isin` method for filtering:
298296
.. ipython:: python
299297
300298
df2 = df.copy()
301-
df2['E']=['one', 'one','two','three','four','three']
299+
df2['E'] = ['one', 'one','two','three','four','three']
302300
df2
303301
df2[df2['E'].isin(['two','four'])]
304302
@@ -310,7 +308,7 @@ by the indexes
310308

311309
.. ipython:: python
312310
313-
s1 = pd.Series([1,2,3,4,5,6],index=pd.date_range('20130102',periods=6))
311+
s1 = pd.Series([1,2,3,4,5,6], index=pd.date_range('20130102', periods=6))
314312
s1
315313
df['F'] = s1
316314
@@ -359,7 +357,7 @@ returns a copy of the data.
359357

360358
.. ipython:: python
361359
362-
df1 = df.reindex(index=dates[0:4],columns=list(df.columns) + ['E'])
360+
df1 = df.reindex(index=dates[0:4], columns=list(df.columns) + ['E'])
363361
df1.loc[dates[0]:dates[1],'E'] = 1
364362
df1
365363
@@ -409,9 +407,9 @@ In addition, pandas automatically broadcasts along the specified dimension.
409407

410408
.. ipython:: python
411409
412-
s = pd.Series([1,3,5,np.nan,6,8],index=dates).shift(2)
410+
s = pd.Series([1,3,5,np.nan,6,8], index=dates).shift(2)
413411
s
414-
df.sub(s,axis='index')
412+
df.sub(s, axis='index')
415413
416414
417415
Apply
@@ -431,7 +429,7 @@ See more at :ref:`Histogramming and Discretization <basics.discretization>`
431429

432430
.. ipython:: python
433431
434-
s = pd.Series(np.random.randint(0,7,size=10))
432+
s = pd.Series(np.random.randint(0, 7, size=10))
435433
s
436434
s.value_counts()
437435
@@ -516,9 +514,9 @@ See the :ref:`Grouping section <groupby>`
516514
.. ipython:: python
517515
518516
df = pd.DataFrame({'A' : ['foo', 'bar', 'foo', 'bar',
519-
'foo', 'bar', 'foo', 'foo'],
517+
'foo', 'bar', 'foo', 'foo'],
520518
'B' : ['one', 'one', 'two', 'three',
521-
'two', 'two', 'one', 'three'],
519+
'two', 'two', 'one', 'three'],
522520
'C' : np.random.randn(8),
523521
'D' : np.random.randn(8)})
524522
df

0 commit comments

Comments
 (0)