Skip to content

Commit 7b13eaf

Browse files
committed
Merge remote-tracking branch 'upstream/master' into windows_crlf
2 parents 2c90601 + 620abc4 commit 7b13eaf

30 files changed

+981
-677
lines changed

doc/source/api.rst

-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,6 @@ Computations / Descriptive Stats
435435
Series.value_counts
436436
Series.compound
437437
Series.nonzero
438-
Series.ptp
439438

440439

441440
Reindexing / Selection / Label manipulation

doc/source/merging.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ You can also pass a list of dicts or Series:
494494
495495
dicts = [{'A': 1, 'B': 2, 'C': 3, 'X': 4},
496496
{'A': 5, 'B': 6, 'C': 7, 'Y': 8}]
497-
result = df1.append(dicts, ignore_index=True)
497+
result = df1.append(dicts, ignore_index=True, sort=False)
498498
499499
.. ipython:: python
500500
:suppress:

doc/source/text.rst

+8-7
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,13 @@ For concatenation with a ``Series`` or ``DataFrame``, it is possible to align th
270270
the ``join``-keyword.
271271

272272
.. ipython:: python
273+
:okwarning:
273274
274-
u = pd.Series(['b', 'd', 'a', 'c'], index=[1, 3, 0, 2])
275-
s
276-
u
277-
s.str.cat(u)
278-
s.str.cat(u, join='left')
275+
u = pd.Series(['b', 'd', 'a', 'c'], index=[1, 3, 0, 2])
276+
s
277+
u
278+
s.str.cat(u)
279+
s.str.cat(u, join='left')
279280
280281
.. warning::
281282

@@ -296,7 +297,7 @@ In particular, alignment also means that the different lengths do not need to co
296297
The same alignment can be used when ``others`` is a ``DataFrame``:
297298

298299
.. ipython:: python
299-
300+
300301
f = d.loc[[3, 2, 1, 0], :]
301302
s
302303
f
@@ -311,7 +312,7 @@ All one-dimensional list-likes can be arbitrarily combined in a list-like contai
311312
312313
s
313314
u
314-
s.str.cat([u, pd.Index(u.values), ['A', 'B', 'C', 'D'], map(str, u.index)], na_rep='-')
315+
s.str.cat([u, u.values, ['A', 'B', 'C', 'D'], map(str, u.index)], na_rep='-')
315316
316317
All elements must match in length to the calling ``Series`` (or ``Index``), except those having an index if ``join`` is not None:
317318

doc/source/whatsnew/v0.10.0.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -281,17 +281,12 @@ The old behavior of printing out summary information can be achieved via the
281281

282282
The width of each line can be changed via 'line_width' (80 by default):
283283

284-
.. ipython:: python
284+
.. code-block:: python
285285

286286
pd.set_option('line_width', 40)
287287

288288
wide_frame
289289

290-
.. ipython:: python
291-
:suppress:
292-
293-
pd.reset_option('line_width')
294-
295290

296291
Updated PyTables Support
297292
~~~~~~~~~~~~~~~~~~~~~~~~

doc/source/whatsnew/v0.13.1.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ API changes
119119
equal. NaNs in identical locations are treated as
120120
equal. (:issue:`5283`) See also :ref:`the docs<basics.equals>` for a motivating example.
121121

122-
.. ipython:: python
123-
:okwarning:
122+
.. code-block:: python
124123

125124
df = DataFrame({'col':['foo', 0, np.nan]})
126125
df2 = DataFrame({'col':[np.nan, 0, 'foo']}, index=[2,1,0])

doc/source/whatsnew/v0.14.1.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ Enhancements
9292
``offsets.apply``, ``rollforward`` and ``rollback`` resets the time (hour,
9393
minute, etc) or not (default ``False``, preserves time) (:issue:`7156`):
9494

95-
.. ipython:: python
95+
.. code-block:: python
9696

97-
import pandas.tseries.offsets as offsets
97+
import pandas.tseries.offsets as offsets
9898

99-
day = offsets.Day()
100-
day.apply(Timestamp('2014-01-01 09:00'))
99+
day = offsets.Day()
100+
day.apply(Timestamp('2014-01-01 09:00'))
101101

102-
day = offsets.Day(normalize=True)
103-
day.apply(Timestamp('2014-01-01 09:00'))
102+
day = offsets.Day(normalize=True)
103+
day.apply(Timestamp('2014-01-01 09:00'))
104104

105105
- ``PeriodIndex`` is represented as the same format as ``DatetimeIndex`` (:issue:`7601`)
106106
- ``StringMethods`` now work on empty Series (:issue:`7242`)

doc/source/whatsnew/v0.15.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ Other:
10081008
business_dates = date_range(start='4/1/2014', end='6/30/2014', freq='B')
10091009
df = DataFrame(1, index=business_dates, columns=['a', 'b'])
10101010
# get the first, 4th, and last date index for each month
1011-
df.groupby((df.index.year, df.index.month)).nth([0, 3, -1])
1011+
df.groupby([df.index.year, df.index.month]).nth([0, 3, -1])
10121012

10131013
- ``Period`` and ``PeriodIndex`` supports addition/subtraction with ``timedelta``-likes (:issue:`7966`)
10141014

doc/source/whatsnew/v0.17.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ We can render the HTML to get the following table.
5858
:file: whatsnew_0171_html_table.html
5959

6060
:class:`~pandas.core.style.Styler` interacts nicely with the Jupyter Notebook.
61-
See the :doc:`documentation <style>` for more.
61+
See the :ref:`documentation </style.ipynb>` for more.
6262

6363
.. _whatsnew_0171.enhancements:
6464

doc/source/whatsnew/v0.23.1.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _whatsnew_0231:
22

3-
v0.23.1
4-
-------
3+
v0.23.1 (June 12, 2018)
4+
-----------------------
55

66
This is a minor bug-fix release in the 0.23.x series and includes some small regression fixes
77
and bug fixes. We recommend that all users upgrade to this version.

doc/source/whatsnew/v0.23.2.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _whatsnew_0232:
22

3-
v0.23.2
4-
-------
3+
v0.23.2 (July 5, 2018)
4+
----------------------
55

66
This is a minor bug-fix release in the 0.23.x series and includes some small regression fixes
77
and bug fixes. We recommend that all users upgrade to this version.

doc/source/whatsnew/v0.23.3.txt

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
.. _whatsnew_0233:
2+
3+
v0.23.3
4+
-------
5+
6+
This is a minor bug-fix release in the 0.23.x series and includes some small regression fixes
7+
and bug fixes. We recommend that all users upgrade to this version.
8+
9+
10+
.. contents:: What's new in v0.23.3
11+
:local:
12+
:backlinks: none
13+
14+
.. _whatsnew_0233.fixed_regressions:
15+
16+
Fixed Regressions
17+
~~~~~~~~~~~~~~~~~
18+
19+
-
20+
-
21+
22+
.. _whatsnew_0233.bug_fixes:
23+
24+
Bug Fixes
25+
~~~~~~~~~
26+
27+
**Conversion**
28+
29+
-
30+
-
31+
32+
**Indexing**
33+
34+
-
35+
-
36+
37+
**I/O**
38+
39+
-
40+
-
41+
42+
**Categorical**
43+
44+
-
45+
-
46+
47+
**Timezones**
48+
49+
-
50+
-
51+
52+
**Timedelta**
53+
54+
-
55+
-

doc/source/whatsnew/v0.24.0.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _whatsnew_0240:
22

3-
v0.24.0
4-
-------
3+
v0.24.0 (Month XX, 2018)
4+
------------------------
55

66
.. _whatsnew_0240.enhancements:
77

@@ -241,6 +241,7 @@ Deprecations
241241

242242
- :meth:`DataFrame.to_stata`, :meth:`read_stata`, :class:`StataReader` and :class:`StataWriter` have deprecated the ``encoding`` argument. The encoding of a Stata dta file is determined by the file type and cannot be changed (:issue:`21244`).
243243
- :meth:`MultiIndex.to_hierarchical` is deprecated and will be removed in a future version (:issue:`21613`)
244+
- :meth:`Series.ptp` is deprecated. Use ``numpy.ptp`` instead (:issue:`21614`)
244245
-
245246

246247
.. _whatsnew_0240.prior_deprecations:
@@ -309,7 +310,7 @@ Timezones
309310
^^^^^^^^^
310311

311312
- Bug in :meth:`DatetimeIndex.shift` where an ``AssertionError`` would raise when shifting across DST (:issue:`8616`)
312-
- Bug in :class:`Timestamp` constructor where passing an invalid timezone offset designator (``Z``) would not raise a ``ValueError``(:issue:`8910`)
313+
- Bug in :class:`Timestamp` constructor where passing an invalid timezone offset designator (``Z``) would not raise a ``ValueError`` (:issue:`8910`)
313314
- Bug in :meth:`Timestamp.replace` where replacing at a DST boundary would retain an incorrect offset (:issue:`7825`)
314315
- Bug in :meth:`Series.replace` with ``datetime64[ns, tz]`` data when replacing ``NaT`` (:issue:`11792`)
315316
- Bug in :class:`Timestamp` when passing different string date formats with a timezone offset would produce different timezone offsets (:issue:`12064`)
@@ -318,6 +319,7 @@ Timezones
318319
- Bug in :class:`Series` constructor which would coerce tz-aware and tz-naive :class:`Timestamp`s to tz-aware (:issue:`13051`)
319320
- Bug in :class:`Index` with ``datetime64[ns, tz]`` dtype that did not localize integer data correctly (:issue:`20964`)
320321
- Bug in :class:`DatetimeIndex` where constructing with an integer and tz would not localize correctly (:issue:`12619`)
322+
- Fixed bug where :meth:`DataFrame.describe` and :meth:`Series.describe` on tz-aware datetimes did not show `first` and `last` result (:issue:`21328`)
321323

322324
Offsets
323325
^^^^^^^

doc/source/whatsnew/v0.8.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ types. For example, ``'kde'`` is a new option:
178178
s = Series(np.concatenate((np.random.randn(1000),
179179
np.random.randn(1000) * 0.5 + 3)))
180180
plt.figure()
181-
s.hist(normed=True, alpha=0.2)
181+
s.hist(density=True, alpha=0.2)
182182
s.plot(kind='kde')
183183

184184
See :ref:`the plotting page <visualization.other>` for much more.

0 commit comments

Comments
 (0)