Merge branch 'master' into fix_9217

Author: mroeschke

.travis.yml

@@ -182,9 +182,9 @@ matrix:
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true
 #    In allow_failures
-    - python: 2.7
+    - python: 3.5
       env:
-        - PYTHON_VERSION=2.7
+        - PYTHON_VERSION=3.5
         - JOB_NAME: "doc_build"
         - FULL_DEPS=true
         - DOC_BUILD=true
@@ -275,9 +275,9 @@ matrix:
         - LOCALE_OVERRIDE="C"
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true
-      - python: 2.7
+      - python: 3.5
         env:
-        - PYTHON_VERSION=2.7
+        - PYTHON_VERSION=3.5
         - JOB_NAME: "doc_build"
         - FULL_DEPS=true
         - DOC_BUILD=true

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
@@ -69,22 +65,15 @@ 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 update -q conda
+  - cmd: conda install conda=4.2.15
   - 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 +87,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/groupby.py

@@ -690,6 +690,3 @@ def time_shift(self):
     def time_transform_dataframe(self):
         # GH 12737
         self.df_nans.groupby('key').transform('first')
-
-
-

asv_bench/benchmarks/inference.py

@@ -95,4 +95,23 @@ def setup(self, dtype, downcast):
         self.data = self.data_dict[dtype]
 
     def time_downcast(self, dtype, downcast):
-        pd.to_numeric(self.data, downcast=downcast)
+        pd.to_numeric(self.data, downcast=downcast)
+
+
+class MaybeConvertNumeric(object):
+
+    def setup(self):
+        n = 1000000
+        arr = np.repeat([2**63], n)
+        arr = arr + np.arange(n).astype('uint64')
+        arr = np.array([arr[i] if i%2 == 0 else
+                        str(arr[i]) for i in range(n)],
+                       dtype=object)
+
+        arr[-1] = -1
+        self.data = arr
+        self.na_values = set()
+
+    def time_convert(self):
+        pd.lib.maybe_convert_numeric(self.data, self.na_values,
+                                     coerce_numeric=False)

asv_bench/benchmarks/io_bench.py

@@ -128,6 +128,29 @@ def time_read_parse_dates_iso8601(self):
         read_csv(StringIO(self.data), header=None, names=['foo'], parse_dates=['foo'])
 
 
+class read_uint64_integers(object):
+    goal_time = 0.2
+
+    def setup(self):
+        self.na_values = [2**63 + 500]
+
+        self.arr1 = np.arange(10000).astype('uint64') + 2**63
+        self.data1 = '\n'.join(map(lambda x: str(x), self.arr1))
+
+        self.arr2 = self.arr1.copy().astype(object)
+        self.arr2[500] = -1
+        self.data2 = '\n'.join(map(lambda x: str(x), self.arr2))
+
+    def time_read_uint64(self):
+        read_csv(StringIO(self.data1), header=None)
+
+    def time_read_uint64_neg_values(self):
+        read_csv(StringIO(self.data2), header=None)
+
+    def time_read_uint64_na_values(self):
+        read_csv(StringIO(self.data1), header=None, na_values=self.na_values)
+
+
 class write_csv_standard(object):
     goal_time = 0.2
 

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

@@ -1,4 +1,4 @@
-dateutil
+python-dateutil
 pytz
 numpy
 cython

ci/requirements-2.7_DOC_BUILD.build renamed to ci/requirements-3.5_DOC_BUILD.build

@@ -7,7 +7,7 @@ notebook
 matplotlib
 scipy
 lxml
-beautiful-soup
+beautifulsoup4
 html5lib
 pytables
 openpyxl=1.8.5

ci/requirements-2.7_DOC_BUILD.run renamed to ci/requirements-3.5_DOC_BUILD.run

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

ci/requirements-2.7_DOC_BUILD.sh renamed to ci/requirements-3.5_DOC_BUILD.sh

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

ci/requirements-3.6-64.run

@@ -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.pip

@@ -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.run

@@ -3,4 +3,4 @@
 
 .. currentmodule:: {{ module.split('.')[0] }}
 
-.. automethod:: {{ [module.split('.')[1], objname]|join('.') }}
+.. autoaccessor:: {{ (module.split('.')[1:] + [objname]) | join('.') }}