Merge branch 'master' into improve_cummin_cummax

Author: mroeschke

appveyor.yml

@@ -17,20 +17,19 @@ environment:
 
   matrix:
 
-    # disable python 3.4 ATM
-    #- PYTHON: "C:\\Python34_64"
-    #  PYTHON_VERSION: "3.4"
-    #  PYTHON_ARCH: "64"
-    #  CONDA_PY: "34"
-    #  CONDA_NPY: "19"
-
-    - PYTHON: "C:\\Python27_64"
+    - CONDA_ROOT: "C:\\Miniconda3.5_64"
+      PYTHON_VERSION: "3.6"
+      PYTHON_ARCH: "64"
+      CONDA_PY: "36"
+      CONDA_NPY: "111"
+
+    - CONDA_ROOT: "C:\\Miniconda3.5_64"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "64"
       CONDA_PY: "27"
       CONDA_NPY: "110"
 
-    - PYTHON: "C:\\Python35_64"
+    - CONDA_ROOT: "C:\\Miniconda3.5_64"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "64"
       CONDA_PY: "35"
@@ -45,9 +44,6 @@ platform:
 # all our python builds have to happen in tests_script...
 build: false
 
-init:
-  - "ECHO %PYTHON_VERSION% %PYTHON%"
-
 install:
   # cancel older builds for the same PR
   - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
@@ -58,7 +54,7 @@ install:
   # this installs the appropriate Miniconda (Py2/Py3, 32/64 bit)
   # updates conda & installs: conda-build jinja2 anaconda-client
   - powershell .\ci\install.ps1
-  - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
+  - SET PATH=%CONDA_ROOT%;%CONDA_ROOT%\Scripts;%PATH%
   - echo "install"
   - cd
   - ls -ltr
@@ -70,21 +66,13 @@ install:
   # install our build environment
   - cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
   - cmd: conda update -q conda
-
-  # fix conda-build version
-  # https://github.com/conda/conda-build/issues/1001
-  # disabling 3.4 as windows complains upon compiling byte
-  # code
-
-  - cmd: conda install conda-build=1.21.7
   - cmd: conda config --set ssl_verify false
 
   # add the pandas channel *before* defaults to have defaults take priority
   - cmd: conda config --add channels conda-forge
   - cmd: conda config --add channels pandas
   - cmd: conda config --remove channels defaults
   - cmd: conda config --add channels defaults
-  - cmd: conda install anaconda-client
 
   # this is now the downloaded conda...
   - cmd: conda info -a
@@ -98,6 +86,8 @@ install:
   - SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
   - cmd: echo "installing requirements from %REQ%"
   - cmd: conda install -n pandas -q --file=%REQ%
+  - cmd: conda list -n pandas
+  - cmd: echo "installing requirements from %REQ% - done"
   - ps: conda install -n pandas (conda build ci\appveyor.recipe -q --output)
 
 test_script:

asv_bench/benchmarks/plotting.py

@@ -20,6 +20,9 @@ def setup(self):
     def time_plot_regular(self):
         self.df.plot()
 
+    def time_plot_regular_compat(self):
+        self.df.plot(x_compat=True)
+
 
 class Misc(object):
     goal_time = 0.6

ci/appveyor.recipe/meta.yaml

@@ -1,6 +1,6 @@
 package:
     name: pandas
-    version: 0.18.1
+    version: 0.20.0
 
 build:
     number: {{environ.get('APPVEYOR_BUILD_NUMBER', 0)}}  # [win]

ci/install.ps1

@@ -84,9 +84,9 @@ function UpdateConda ($python_home) {
 
 
 function main () {
-    InstallMiniconda $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
-    UpdateConda $env:PYTHON
-    InstallCondaPackages $env:PYTHON "conda-build jinja2 anaconda-client"
+    InstallMiniconda "3.5" $env:PYTHON_ARCH $env:CONDA_ROOT
+    UpdateConda $env:CONDA_ROOT
+    InstallCondaPackages $env:CONDA_ROOT "conda-build jinja2 anaconda-client"
 }
 
 main

ci/install_appveyor.ps1

@@ -0,0 +1,13 @@
+python-dateutil
+pytz
+numpy
+openpyxl
+xlsxwriter
+xlrd
+#xlwt
+scipy
+feather-format
+numexpr
+pytables
+matplotlib
+blosc

ci/requirements-3.6-64.run

@@ -0,0 +1 @@
+xlwt

ci/requirements-3.6.pip

@@ -2,3 +2,19 @@ python-dateutil
 pytz
 numpy
 scipy
+openpyxl
+xlsxwriter
+xlrd
+# xlwt (installed via pip)
+numexpr
+pytables
+# matplotlib (not avail on defaults ATM)
+lxml
+html5lib
+jinja2
+sqlalchemy
+pymysql
+# psycopg2 (not avail on defaults ATM)
+beautifulsoup4
+s3fs
+xarray

ci/requirements-3.6.run

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source activate pandas
+
+echo "install 36"
+
+conda install -n pandas -c conda-forge feather-format

ci/requirements-3.6.sh

@@ -281,9 +281,14 @@ Performance Improvements
 
 - Improved performance of ``pd.wide_to_long()`` (:issue:`14779`)
 - Increased performance of ``pd.factorize()`` by releasing the GIL with ``object`` dtype when inferred as strings (:issue:`14859`)
+- Improved performance of timeseries plotting with an irregular DatetimeIndex
+  (or with ``compat_x=True``) (:issue:`15073`).
 - Improved performance of ``groupby().cummin()`` and ``groupby().cummax()`` (:issue:`15048`)
 
 
+- When reading buffer object in ``read_sas()`` method without specified format, filepath string is inferred rather than buffer object.
+
+
 .. _whatsnew_0200.bug_fixes:
 
 Bug Fixes

doc/source/whatsnew/v0.20.0.txt

@@ -1,10 +1,12 @@
 """
 Read SAS sas7bdat or xport files.
 """
+from pandas import compat
 
 
 def read_sas(filepath_or_buffer, format=None, index=None, encoding=None,
              chunksize=None, iterator=False):
+
     """
     Read SAS files stored as either XPORT or SAS7BDAT format files.
 
@@ -29,8 +31,12 @@ def read_sas(filepath_or_buffer, format=None, index=None, encoding=None,
     DataFrame if iterator=False and chunksize=None, else SAS7BDATReader
     or XportReader
     """
-
     if format is None:
+        buffer_error_msg = ("If this is a buffer object rather "
+                            "than a string name, you must specify "
+                            "a format string")
+        if not isinstance(filepath_or_buffer, compat.string_types):
+            raise ValueError(buffer_error_msg)
         try:
             fname = filepath_or_buffer.lower()
             if fname.endswith(".xpt"):

pandas/io/sas/sasreader.py

@@ -0,0 +1,13 @@
+import pandas.util.testing as tm
+from pandas.compat import StringIO
+from pandas import read_sas
+
+
+class TestSas(tm.TestCase):
+
+    def test_sas_buffer_format(self):
+
+        # GH14947
+        b = StringIO("")
+        with self.assertRaises(ValueError):
+            read_sas(b)

pandas/io/tests/sas/test_sas.py

@@ -448,6 +448,7 @@ def test_read_excel_blank_with_header(self):
 
     # GH 12292 : error when read one empty column from excel file
     def test_read_one_empty_col_no_header(self):
+        _skip_if_no_xlwt()
         df = pd.DataFrame(
             [["", 1, 100],
              ["", 2, 200],
@@ -504,6 +505,7 @@ def test_read_one_empty_col_with_header(self):
         tm.assert_frame_equal(actual_header_zero, expected_header_zero)
 
     def test_set_column_names_in_parameter(self):
+        _skip_if_no_xlwt()
         # GH 12870 : pass down column names associated with
         # keyword argument names
         refdf = pd.DataFrame([[1, 'foo'], [2, 'bar'],

pandas/io/tests/test_excel.py

@@ -212,7 +212,7 @@ def try_parse(values):
             try:
                 values = tools.to_datetime(values)
                 if isinstance(values, Index):
-                    values = values.map(_dt_to_float_ordinal)
+                    values = _dt_to_float_ordinal(values)
                 else:
                     values = [_dt_to_float_ordinal(x) for x in values]
             except Exception:

pandas/tseries/converter.py

@@ -3,7 +3,7 @@
 import nose
 
 import numpy as np
-from pandas import Timestamp, Period, Index
+from pandas import Timestamp, Period
 from pandas.compat import u
 import pandas.util.testing as tm
 from pandas.tseries.offsets import Second, Milli, Micro
@@ -104,8 +104,8 @@ def test_dateindex_conversion(self):
         for freq in ('B', 'L', 'S'):
             dateindex = tm.makeDateIndex(k=10, freq=freq)
             rs = self.dtc.convert(dateindex, None, None)
-            xp = Index(converter.dates.date2num(dateindex._mpl_repr()))
-            tm.assert_index_equal(rs, xp, decimals)
+            xp = converter.dates.date2num(dateindex._mpl_repr())
+            tm.assert_almost_equal(rs, xp, decimals)
 
     def test_resolution(self):
         def _assert_less(ts1, ts2):