Merge remote-tracking branch 'upstream/master' into 33200-groupby-quantile

Author: simonjayhawkins

asv_bench/benchmarks/io/parsers.py

@@ -2,7 +2,7 @@
 
 try:
     from pandas._libs.tslibs.parsing import (
-        _concat_date_cols,
+        concat_date_cols,
         _does_string_look_like_datetime,
     )
 except ImportError:
@@ -39,4 +39,4 @@ def setup(self, value, dim):
             )
 
     def time_check_concat(self, value, dim):
-        _concat_date_cols(self.object)
+        concat_date_cols(self.object)

ci/code_checks.sh

@@ -353,8 +353,8 @@ fi
 ### DOCSTRINGS ###
 if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
 
-    MSG='Validate docstrings (GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS04, SS05, PR03, PR04, PR05, PR10, EX04, RT01, RT04, RT05, SA02, SA03, SA05)' ; echo $MSG
-    $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS04,SS05,PR03,PR04,PR05,PR10,EX04,RT01,RT04,RT05,SA02,SA03,SA05
+    MSG='Validate docstrings (GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS04, SS05, PR03, PR04, PR05, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG
+    $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS04,SS05,PR03,PR04,PR05,PR10,EX04,RT01,RT04,RT05,SA02,SA03
     RET=$(($RET + $?)) ; echo $MSG "DONE"
 
     MSG='Validate correct capitalization among titles in documentation' ; echo $MSG

ci/deps/azure-36-minimum_versions.yaml

@@ -1,6 +1,5 @@
 name: pandas-dev
 channels:
-  - defaults
   - conda-forge
 dependencies:
   - python=3.6.1
@@ -19,12 +18,12 @@ dependencies:
   - jinja2=2.8
   - numba=0.46.0
   - numexpr=2.6.2
-  - numpy=1.13.3
+  - numpy=1.15.4
   - openpyxl=2.5.7
   - pytables=3.4.3
   - python-dateutil=2.7.3
   - pytz=2017.2
-  - scipy=0.19.0
+  - scipy=1.2
   - xlrd=1.1.0
   - xlsxwriter=0.9.8
   - xlwt=1.2.0

ci/deps/azure-37-numpydev.yaml

@@ -14,7 +14,7 @@ dependencies:
   - pytz
   - pip
   - pip:
-    - cython>=0.29.16
+    - cython==0.29.16 # GH#34014
     - "git+git://github.com/dateutil/dateutil.git"
     - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
     - "--pre"

ci/deps/azure-macos-36.yaml

@@ -19,7 +19,7 @@ dependencies:
   - matplotlib=2.2.3
   - nomkl
   - numexpr
-  - numpy=1.14
+  - numpy=1.15.4
   - openpyxl
   - pyarrow>=0.13.0
   - pytables

conda.recipe/meta.yaml

@@ -20,12 +20,12 @@ requirements:
     - cython
     - numpy
     - setuptools >=3.3
-    - python-dateutil >=2.5.0
+    - python-dateutil >=2.7.3
     - pytz
   run:
     - python {{ python }}
     - {{ pin_compatible('numpy') }}
-    - python-dateutil >=2.5.0
+    - python-dateutil >=2.7.3
     - pytz
 
 test:

doc/source/conf.py

@@ -410,7 +410,7 @@
     intersphinx_mapping = {
         "dateutil": ("https://dateutil.readthedocs.io/en/latest/", None),
         "matplotlib": ("https://matplotlib.org/", None),
-        "numpy": ("https://docs.scipy.org/doc/numpy/", None),
+        "numpy": ("https://numpy.org/doc/stable/", None),
         "pandas-gbq": ("https://pandas-gbq.readthedocs.io/en/latest/", None),
         "py": ("https://pylib.readthedocs.io/en/latest/", None),
         "python": ("https://docs.python.org/3/", None),

doc/source/getting_started/install.rst

@@ -220,7 +220,7 @@ Dependencies
 Package                                                          Minimum supported version
 ================================================================ ==========================
 `setuptools <https://setuptools.readthedocs.io/en/latest/>`__    24.2.0
-`NumPy <https://www.numpy.org>`__                                1.13.3
+`NumPy <https://www.numpy.org>`__                                1.15.4
 `python-dateutil <https://dateutil.readthedocs.io/en/stable/>`__ 2.7.3
 `pytz <https://pypi.org/project/pytz/>`__                        2017.2
 ================================================================ ==========================

doc/source/reference/groupby.rst

@@ -36,8 +36,10 @@ Function application
 
    GroupBy.apply
    GroupBy.agg
-   GroupBy.aggregate
-   GroupBy.transform
+   SeriesGroupBy.aggregate
+   DataFrameGroupBy.aggregate
+   SeriesGroupBy.transform
+   DataFrameGroupBy.transform
    GroupBy.pipe
 
 Computations / descriptive stats

doc/source/whatsnew/v0.18.0.rst

@@ -1,7 +1,7 @@
 .. _whatsnew_0180:
 
-v0.18.0 (March 13, 2016)
-------------------------
+Version 0.18.0 (March 13, 2016)
+-------------------------------
 
 {{ header }}
 
@@ -145,7 +145,7 @@ This continues to work as before for function or dict-like values.
 
 .. _whatsnew_0180.enhancements.rangeindex:
 
-Range index
+Range Index
 ^^^^^^^^^^^
 
 A ``RangeIndex`` has been added to the ``Int64Index`` sub-classes to support a memory saving alternative for common use cases. This has a similar implementation to the python ``range`` object (``xrange`` in python 2), in that it only stores the start, stop, and step values for the index. It will transparently interact with the user API, converting to ``Int64Index`` if needed.
@@ -456,8 +456,8 @@ New behavior:
 
 .. _whatsnew_0180.enhancements.xarray:
 
-to_xarray
-^^^^^^^^^
+Method to_xarray
+^^^^^^^^^^^^^^^^
 
 In a future version of pandas, we will be deprecating ``Panel`` and other > 2 ndim objects. In order to provide for continuity,
 all ``NDFrame`` objects have gained the ``.to_xarray()`` method in order to convert to ``xarray`` objects, which has