Merge remote-tracking branch 'upstream/master' into df_set_index_warn

Author: h-vetinari

.travis.yml

@@ -53,18 +53,20 @@ matrix:
  - dist: trusty
  env:
  - JOB="3.6, coverage" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true DOCTEST=true
- # In allow_failures
- - dist: trusty
- env:
- - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
- # In allow_failures
+
  - dist: trusty
  env:
  - JOB="3.7, NumPy dev" ENV_FILE="ci/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate"
  addons:
  apt:
  packages:
  - xsel
+
+ # In allow_failures
+ - dist: trusty
+ env:
+ - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
+
  # In allow_failures
  - dist: trusty
  env:
@@ -73,13 +75,6 @@ matrix:
  - dist: trusty
  env:
  - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
- - dist: trusty
- env:
- - JOB="3.7, NumPy dev" ENV_FILE="ci/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate"
- addons:
- apt:
- packages:
- - xsel
  - dist: trusty
  env:
  - JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true

README.md

@@ -97,7 +97,7 @@ easy and intuitive. It aims to be the fundamental high-level building block for
 doing practical, **real world** data analysis in Python. Additionally, it has
 the broader goal of becoming **the most powerful and flexible open source data
 analysis / manipulation tool available in any language**. It is already well on
-its way toward this goal.
+its way towards this goal.
 
 ## Main Features
 Here are just a few of the things that pandas does well:

asv_bench/benchmarks/indexing.py

@@ -2,10 +2,10 @@
 
 import numpy as np
 import pandas.util.testing as tm
-from pandas import (Series, DataFrame, MultiIndex, Int64Index, Float64Index,
- IntervalIndex, CategoricalIndex,
- IndexSlice, concat, date_range)
-from .pandas_vb_common import setup, Panel # noqa
+from pandas import (Series, DataFrame, MultiIndex, Panel,
+ Int64Index, Float64Index, IntervalIndex,
+ CategoricalIndex, IndexSlice, concat, date_range)
+from .pandas_vb_common import setup # noqa
 
 
 class NumericSeriesIndexing(object):

asv_bench/benchmarks/join_merge.py

@@ -3,14 +3,15 @@
 
 import numpy as np
 import pandas.util.testing as tm
-from pandas import (DataFrame, Series, MultiIndex, date_range, concat, merge,
- merge_asof)
+from pandas import (DataFrame, Series, Panel, MultiIndex,
+ date_range, concat, merge, merge_asof)
+
 try:
  from pandas import merge_ordered
 except ImportError:
  from pandas import ordered_merge as merge_ordered
 
-from .pandas_vb_common import Panel, setup # noqa
+from .pandas_vb_common import setup # noqa
 
 
 class Append(object):

asv_bench/benchmarks/panel_ctor.py

@@ -1,9 +1,9 @@
 import warnings
 from datetime import datetime, timedelta
 
-from pandas import DataFrame, DatetimeIndex, date_range
+from pandas import DataFrame, Panel, DatetimeIndex, date_range
 
-from .pandas_vb_common import Panel, setup # noqa
+from .pandas_vb_common import setup # noqa
 
 
 class DifferentIndexes(object):

asv_bench/benchmarks/panel_methods.py

@@ -1,8 +1,9 @@
 import warnings
 
 import numpy as np
+from pandas import Panel
 
-from .pandas_vb_common import Panel, setup # noqa
+from .pandas_vb_common import setup # noqa
 
 
 class PanelMethods(object):

ci/travis-36-doc.yaml

@@ -12,7 +12,7 @@ dependencies:
  - html5lib
  - hypothesis>=3.58.0
  - ipykernel
- - ipython
+ - ipython==6.5.0
  - ipywidgets
  - lxml
  - matplotlib

doc/source/contributing.rst

@@ -880,7 +880,7 @@ If your change involves checking that a warning is actually emitted, use
 
 .. code-block:: python
 
- with tm.assert_prodcues_warning(FutureWarning):
+ with tm.assert_produces_warning(FutureWarning):
  df.some_operation()
 
 We prefer this to the ``pytest.warns`` context manager because ours checks that the warning's

doc/source/whatsnew/v0.24.0.txt

@@ -199,6 +199,7 @@ Other Enhancements
 
 Backwards incompatible API changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- A newly constructed empty :class:`DataFrame` with integer as the ``dtype`` will now only be cast to ``float64`` if ``index`` is specified (:issue:`22858`)
 
 
 .. _whatsnew_0240.api_breaking.interval_values:
@@ -505,6 +506,7 @@ ExtensionType Changes
 - :meth:`Series.astype` and :meth:`DataFrame.astype` now dispatch to :meth:`ExtensionArray.astype` (:issue:`21185:`).
 - Slicing a single row of a ``DataFrame`` with multiple ExtensionArrays of the same type now preserves the dtype, rather than coercing to object (:issue:`22784`)
 - Added :meth:`pandas.api.types.register_extension_dtype` to register an extension type with pandas (:issue:`22664`)
+- Updated the ``.type`` attribute for ``PeriodDtype``, ``DatetimeTZDtype``, and ``IntervalDtype`` to be instances of the dtype (``Period``, ``Timestamp``, and ``Interval`` respectively) (:issue:`22938`)
 
 .. _whatsnew_0240.api.incompatibilities:
 
@@ -848,6 +850,7 @@ Reshaping
 - Bug in :meth:`DataFrame.drop_duplicates` for empty ``DataFrame`` which incorrectly raises an error (:issue:`20516`)
 - Bug in :func:`pandas.wide_to_long` when a string is passed to the stubnames argument and a column name is a substring of that stubname (:issue:`22468`)
 - Bug in :func:`merge` when merging ``datetime64[ns, tz]`` data that contained a DST transition (:issue:`18885`)
+- Bug in :func:`merge_asof` when merging on float values within defined tolerance (:issue:`22981`)
 
 Build Changes
 ^^^^^^^^^^^^^

pandas/_libs/algos_common_helper.pxi.in

@@ -2,7 +2,6 @@
 Template for each `dtype` helper function using 1-d template
 
 # 1-d template
-- map_indices
 - pad
 - pad_1d
 - pad_2d