Skip to content

Commit 045c912

Browse files
another-greenanother-green
committed
Merge remote-tracking branch 'upstream/master' into cat
2 parents 99204a4 + 7f31865 commit 045c912

19 files changed

+36
-35
lines changed

‎pandas/core/arrays/categorical.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ class Categorical(ExtensionArray, PandasObject):
279279
Notes
280280
-----
281281
See the `user guide
282-
<http://pandas.pydata.org/pandas-docs/stable/categorical.html>`_ for more.
282+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/categorical.html>`_
283+
for more.
283284
284285
Examples
285286
--------

‎pandas/core/arrays/interval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
Notes
9696
-----
9797
See the `user guide
98-
<http://pandas.pydata.org/pandas-docs/stable/advanced.html#intervalindex>`_
98+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/advanced.html#intervalindex>`_
9999
for more.
100100
101101
%(examples)s\

‎pandas/core/dtypes/concat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def union_categoricals(to_union, sort_categories=False, ignore_order=False):
244244
-----
245245
246246
To learn more about categories, see `link
247-
<http://pandas.pydata.org/pandas-docs/stable/categorical.html#unioning>`__
247+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/categorical.html#unioning>`__
248248
249249
Examples
250250
--------

‎pandas/core/generic.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -3328,8 +3328,8 @@ def _check_setitem_copy(self, stacklevel=4, t='setting', force=False):
33283328
"A value is trying to be set on a copy of a slice from a "
33293329
"DataFrame\n\n"
33303330
"See the caveats in the documentation: "
3331-
"http://pandas.pydata.org/pandas-docs/stable/"
3332-
"indexing.html#indexing-view-versus-copy"
3331+
"http://pandas.pydata.org/pandas-docs/stable/user_guide/"
3332+
"indexing.html#returning-a-view-versus-a-copy"
33333333
)
33343334

33353335
else:
@@ -3338,8 +3338,8 @@ def _check_setitem_copy(self, stacklevel=4, t='setting', force=False):
33383338
"DataFrame.\n"
33393339
"Try using .loc[row_indexer,col_indexer] = value "
33403340
"instead\n\nSee the caveats in the documentation: "
3341-
"http://pandas.pydata.org/pandas-docs/stable/"
3342-
"indexing.html#indexing-view-versus-copy"
3341+
"http://pandas.pydata.org/pandas-docs/stable/user_guide/"
3342+
"indexing.html#returning-a-view-versus-a-copy"
33433343
)
33443344

33453345
if value == 'raise':
@@ -7762,7 +7762,7 @@ def asfreq(self, freq, method=None, how=None, normalize=False,
77627762
Notes
77637763
-----
77647764
To learn more about the frequency strings, please see `this link
7765-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
7765+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
77667766
77677767
Examples
77687768
--------

‎pandas/core/groupby/groupby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class providing the base-class of operations.
219219
Notes
220220
-----
221221
See more `here
222-
<http://pandas.pydata.org/pandas-docs/stable/groupby.html#piping-function-calls>`_
222+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/groupby.html#piping-function-calls>`_
223223
224224
Examples
225225
--------

‎pandas/core/groupby/grouper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Grouper:
4949
This will groupby the specified frequency if the target selection
5050
(via key or level) is a datetime-like object. For full specification
5151
of available frequencies, please see `here
52-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`_.
52+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`_.
5353
axis : number/name of the axis, defaults to 0
5454
sort : boolean, default to False
5555
whether to sort the resulting labels

‎pandas/core/indexes/datetimes.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class DatetimeIndex(DatetimeIndexOpsMixin, Int64Index, DatetimeDelegateMixin):
215215
Notes
216216
-----
217217
To learn more about the frequency strings, please see `this link
218-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
218+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
219219
220220
Creating a DatetimeIndex based on `start`, `periods`, and `end` has
221221
been deprecated in favor of :func:`date_range`.
@@ -1377,7 +1377,7 @@ def date_range(start=None, end=None, periods=None, freq=None, tz=None,
13771377
``start`` and ``end`` (closed on both sides).
13781378
13791379
To learn more about the frequency strings, please see `this link
1380-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
1380+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
13811381
13821382
Examples
13831383
--------
@@ -1533,7 +1533,7 @@ def bdate_range(start=None, end=None, periods=None, freq='B', tz=None,
15331533
desired.
15341534
15351535
To learn more about the frequency strings, please see `this link
1536-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
1536+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
15371537
15381538
Examples
15391539
--------
@@ -1605,7 +1605,7 @@ def cdate_range(start=None, end=None, periods=None, freq='C', tz=None,
16051605
must be specified.
16061606
16071607
To learn more about the frequency strings, please see `this link
1608-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
1608+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
16091609
16101610
Returns
16111611
-------

‎pandas/core/indexes/interval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ def interval_range(start=None, end=None, periods=None, freq=None,
12151215
``start`` and ``end``, inclusively.
12161216
12171217
To learn more about datetime-like frequency strings, please see `this link
1218-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
1218+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
12191219
12201220
Examples
12211221
--------

‎pandas/core/indexes/multi.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ class MultiIndex(Index):
182182
Notes
183183
-----
184184
See the `user guide
185-
<http://pandas.pydata.org/pandas-docs/stable/advanced.html>`_ for more.
185+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/advanced.html>`_
186+
for more.
186187
187188
Examples
188189
--------

‎pandas/core/indexes/period.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ def period_range(start=None, end=None, periods=None, freq=None, name=None):
939939
must be specified.
940940
941941
To learn more about the frequency strings, please see `this link
942-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
942+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
943943
944944
Examples
945945
--------

‎pandas/core/indexes/timedeltas.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class TimedeltaIndex(DatetimeIndexOpsMixin, dtl.TimelikeOps, Int64Index,
141141
Notes
142142
-----
143143
To learn more about the frequency strings, please see `this link
144-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
144+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
145145
146146
Creating a TimedeltaIndex based on `start`, `periods`, and `end` has
147147
been deprecated in favor of :func:`timedelta_range`.
@@ -730,7 +730,7 @@ def timedelta_range(start=None, end=None, periods=None, freq=None,
730730
``start`` and ``end`` (closed on both sides).
731731
732732
To learn more about the frequency strings, please see `this link
733-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
733+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
734734
735735
Examples
736736
--------

‎pandas/core/indexing.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ def _validate_read_indexer(self, key, indexer, axis, raise_missing=False):
11901190
KeyError in the future, you can use .reindex() as an alternative.
11911191
11921192
See the documentation here:
1193-
https://pandas.pydata.org/pandas-docs/stable/indexing.html#deprecate-loc-reindex-listlike""") # noqa
1193+
https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#deprecate-loc-reindex-listlike""") # noqa
11941194

11951195
if not (ax.is_categorical() or ax.is_interval()):
11961196
warnings.warn(_missing_key_warning,
@@ -1339,7 +1339,7 @@ class _IXIndexer(_NDFrameIndexer):
13391339
.iloc for positional indexing
13401340
13411341
See the documentation here:
1342-
http://pandas.pydata.org/pandas-docs/stable/indexing.html#ix-indexer-is-deprecated""") # noqa
1342+
http://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#ix-indexer-is-deprecated""") # noqa
13431343

13441344
def __init__(self, name, obj):
13451345
warnings.warn(self._ix_deprecation_warning,

‎pandas/core/reshape/concat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def concat(objs, axis=0, join='outer', join_axes=None, ignore_index=False,
100100
101101
A walkthrough of how this method fits in with other tools for combining
102102
pandas objects can be found `here
103-
<http://pandas.pydata.org/pandas-docs/stable/merging.html>`__.
103+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/merging.html>`__.
104104
105105
Examples
106106
--------

‎pandas/core/tools/datetimes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ def to_datetime(arg, errors='raise', dayfirst=False, yearfirst=False,
533533
dtype: datetime64[ns]
534534
535535
If a date does not meet the `timestamp limitations
536-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html
536+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html
537537
#timeseries-timestamp-limits>`_, passing errors='ignore'
538538
will return the original input instead of raising any exception.
539539

‎pandas/core/window.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ class Window(_Window):
462462
See the notes below for further information.
463463
on : str, optional
464464
For a DataFrame, column on which to calculate
465-
the rolling window, rather than the index
465+
the rolling window, rather than the index.
466466
axis : int or str, default 0
467467
closed : str, default None
468468
Make the interval closed on the 'right', 'left', 'both' or
@@ -488,7 +488,7 @@ class Window(_Window):
488488
changed to the center of the window by setting ``center=True``.
489489
490490
To learn more about the offsets & frequency strings, please see `this link
491-
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
491+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`__.
492492
493493
The recognized win_types are:
494494
@@ -2188,7 +2188,7 @@ class EWM(_Rolling):
21882188
(if adjust is True), and 1-alpha and alpha (if adjust is False).
21892189
21902190
More details can be found at
2191-
http://pandas.pydata.org/pandas-docs/stable/computation.html#exponentially-weighted-windows
2191+
http://pandas.pydata.org/pandas-docs/stable/user_guide/computation.html#exponentially-weighted-windows
21922192
21932193
Examples
21942194
--------

‎pandas/io/json/json.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ def read_json(path_or_buf=None, orient=None, typ='frame', dtype=None,
330330
331331
chunksize : integer, default None
332332
Return JsonReader object for iteration.
333-
See the `line-delimted json docs
334-
<http://pandas.pydata.org/pandas-docs/stable/io.html#io-jsonl>`_
333+
See the `line-delimited json docs
334+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/io.html#line-delimited-json>`_
335335
for more information on ``chunksize``.
336336
This can only be passed if `lines=True`.
337337
If this is None, the file will be read into memory all at once.

‎pandas/io/parsers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
into chunks.
5959
6060
Additional help can be found in the online docs for
61-
`IO Tools <http://pandas.pydata.org/pandas-docs/stable/io.html>`_.
61+
`IO Tools <http://pandas.pydata.org/pandas-docs/stable/user_guide/io.html>`_.
6262
6363
Parameters
6464
----------
@@ -753,7 +753,7 @@ def read_fwf(filepath_or_buffer: FilePathOrBuffer,
753753
into chunks.
754754
755755
Additional help can be found in the `online docs for IO Tools
756-
<http://pandas.pydata.org/pandas-docs/stable/io.html>`_.
756+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/io.html>`_.
757757
758758
Parameters
759759
----------

‎pandas/io/pytables.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -867,8 +867,8 @@ def put(self, key, value, format=None, append=False, **kwargs):
867867
This will force Table format, append the input data to the
868868
existing.
869869
data_columns : list of columns to create as data columns, or True to
870-
use all columns. See
871-
`here <http://pandas.pydata.org/pandas-docs/stable/io.html#query-via-data-columns>`__ # noqa
870+
use all columns. See `here
871+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/io.html#query-via-data-columns>`__.
872872
encoding : default None, provide an encoding for strings
873873
dropna : boolean, default False, do not write an ALL nan row to
874874
the store settable by the option 'io.hdf.dropna_table'
@@ -949,7 +949,7 @@ def append(self, key, value, format=None, append=True, columns=None,
949949
List of columns to create as indexed data columns for on-disk
950950
queries, or True to use all columns. By default only the axes
951951
of the object are indexed. See `here
952-
<http://pandas.pydata.org/pandas-docs/stable/io.html#query-via-data-columns>`__.
952+
<http://pandas.pydata.org/pandas-docs/stable/user_guide/io.html#query-via-data-columns>`__.
953953
min_itemsize : dict of columns that specify minimum string sizes
954954
nan_rep : string to use as string nan represenation
955955
chunksize : size to chunk the writing

‎pandas/tests/frame/test_constructors.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import pandas as pd
1616
from pandas import (
1717
Categorical, DataFrame, Index, MultiIndex, RangeIndex, Series, Timedelta,
18-
Timestamp, compat, date_range, isna)
18+
Timestamp, date_range, isna)
1919
from pandas.tests.frame.common import TestData
2020
import pandas.util.testing as tm
2121

@@ -113,7 +113,6 @@ def test_constructor_dtype_list_data(self):
113113
assert df.loc[1, 0] is None
114114
assert df.loc[0, 1] == '2'
115115

116-
@pytest.mark.xfail(compat.numpy._is_numpy_dev, reason="GH-26546")
117116
def test_constructor_list_frames(self):
118117
# see gh-3243
119118
result = DataFrame([DataFrame()])

0 commit comments

Comments
 (0)