Merge with master

Author: sakarpanta

.gitignore

@@ -61,6 +61,7 @@ dist
 .coverage
 coverage.xml
 coverage_html_report
+.mypy_cache
 *.pytest_cache
 # hypothesis test database
 .hypothesis/

.travis.yml

@@ -1,6 +1,5 @@
 sudo: false
 language: python
-# Default Python version is usually 2.7
 python: 3.5
 
 # To turn off cached cython files and compiler cache
@@ -36,21 +35,13 @@ matrix:
       env:
         - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network)"
 
-    - dist: trusty
-      env:
-        - JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="(not slow or (single and db))"
-      addons:
-        apt:
-          packages:
-          - python-gtk2
-
     - dist: trusty
       env:
         - JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8"
 
     - dist: trusty
       env:
-        - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
+        - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
 
     # In allow_failures
     - dist: trusty
@@ -91,15 +82,10 @@ before_install:
 install:
   - echo "install start"
   - ci/prep_cython_cache.sh
-  - ci/install_travis.sh
+  - ci/setup_env.sh
   - ci/submit_cython_cache.sh
   - echo "install done"
 
-before_script:
-  - ci/install_db_travis.sh
-  - export DISPLAY=":99.0"
-  - ci/before_script_travis.sh
-
 script:
   - echo "script start"
   - source activate pandas-dev

README.md

@@ -26,8 +26,9 @@
   <td>Package Status</td>
   <td>
 		<a href="https://pypi.org/project/pandas/">
-		<img src="https://img.shields.io/pypi/status/pandas.svg" alt="status" /></td>
+		<img src="https://img.shields.io/pypi/status/pandas.svg" alt="status" />
 		</a>
+  </td>
 </tr>
 <tr>
   <td>License</td>
@@ -73,8 +74,8 @@
 	<td>Gitter</td>
 	<td>
 		<a href="https://gitter.im/pydata/pandas">
-		<img src="https://badges.gitter.im/Join%20Chat.svg"
-	</a>
+		<img src="https://badges.gitter.im/Join%20Chat.svg" />
+		</a>
 	</td>
 </tr>
 </table>
@@ -163,9 +164,9 @@ pip install pandas
 ```
 
 ## Dependencies
-- [NumPy](https://www.numpy.org): 1.12.0 or higher
+- [NumPy](https://www.numpy.org): 1.13.3 or higher
 - [python-dateutil](https://labix.org/python-dateutil): 2.5.0 or higher
-- [pytz](https://pythonhosted.org/pytz): 2011k or higher
+- [pytz](https://pythonhosted.org/pytz): 2015.4 or higher
 
 See the [full installation instructions](https://pandas.pydata.org/pandas-docs/stable/install.html#dependencies)
 for recommended and optional dependencies.

asv_bench/benchmarks/indexing.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 import pandas.util.testing as tm
-from pandas import (Series, DataFrame, Panel, MultiIndex,
+from pandas import (Series, DataFrame, MultiIndex,
                     Int64Index, UInt64Index, Float64Index,
                     IntervalIndex, CategoricalIndex,
                     IndexSlice, concat, date_range)
@@ -277,18 +277,6 @@ def time_get_indexer_list(self, index):
         self.data.get_indexer(self.cat_list)
 
 
-class PanelIndexing(object):
-
-    def setup(self):
-        with warnings.catch_warnings(record=True):
-            self.p = Panel(np.random.randn(100, 100, 100))
-            self.inds = range(0, 100, 10)
-
-    def time_subset(self):
-        with warnings.catch_warnings(record=True):
-            self.p.ix[(self.inds, self.inds, self.inds)]
-
-
 class MethodLookup(object):
 
     def setup_cache(self):

asv_bench/benchmarks/io/csv.py

@@ -4,7 +4,7 @@
 import numpy as np
 import pandas.util.testing as tm
 from pandas import DataFrame, Categorical, date_range, read_csv
-from pandas.compat import cStringIO as StringIO
+from io import StringIO
 
 from ..pandas_vb_common import BaseIO
 

asv_bench/benchmarks/io/excel.py

@@ -1,6 +1,6 @@
+from io import BytesIO
 import numpy as np
 from pandas import DataFrame, date_range, ExcelWriter, read_excel
-from pandas.compat import BytesIO
 import pandas.util.testing as tm
 
 

asv_bench/benchmarks/io/stata.py

@@ -12,12 +12,12 @@ class Stata(BaseIO):
 
     def setup(self, convert_dates):
         self.fname = '__test__.dta'
-        N = 100000
-        C = 5
+        N = self.N = 100000
+        C = self.C = 5
         self.df = DataFrame(np.random.randn(N, C),
                             columns=['float{}'.format(i) for i in range(C)],
                             index=date_range('20000101', periods=N, freq='H'))
-        self.df['object'] = tm.makeStringIndex(N)
+        self.df['object'] = tm.makeStringIndex(self.N)
         self.df['int8_'] = np.random.randint(np.iinfo(np.int8).min,
                                              np.iinfo(np.int8).max - 27, N)
         self.df['int16_'] = np.random.randint(np.iinfo(np.int16).min,
@@ -36,4 +36,14 @@ def time_write_stata(self, convert_dates):
         self.df.to_stata(self.fname, self.convert_dates)
 
 
+class StataMissing(Stata):
+    def setup(self, convert_dates):
+        super(StataMissing, self).setup(convert_dates)
+        for i in range(10):
+            missing_data = np.random.randn(self.N)
+            missing_data[missing_data < 0] = np.nan
+            self.df['missing_{0}'.format(i)] = missing_data
+        self.df.to_stata(self.fname, self.convert_dates)
+
+
 from ..pandas_vb_common import setup  # noqa: F401

asv_bench/benchmarks/join_merge.py

@@ -1,9 +1,8 @@
-import warnings
 import string
 
 import numpy as np
 import pandas.util.testing as tm
-from pandas import (DataFrame, Series, Panel, MultiIndex,
+from pandas import (DataFrame, Series, MultiIndex,
                     date_range, concat, merge, merge_asof)
 
 try:
@@ -66,31 +65,6 @@ def time_concat_mixed_ndims(self, axis):
         concat(self.mixed_ndims, axis=axis)
 
 
-class ConcatPanels(object):
-
-    params = ([0, 1, 2], [True, False])
-    param_names = ['axis', 'ignore_index']
-
-    def setup(self, axis, ignore_index):
-        with warnings.catch_warnings(record=True):
-            panel_c = Panel(np.zeros((10000, 200, 2),
-                                     dtype=np.float32,
-                                     order='C'))
-            self.panels_c = [panel_c] * 20
-            panel_f = Panel(np.zeros((10000, 200, 2),
-                            dtype=np.float32,
-                            order='F'))
-            self.panels_f = [panel_f] * 20
-
-    def time_c_ordered(self, axis, ignore_index):
-        with warnings.catch_warnings(record=True):
-            concat(self.panels_c, axis=axis, ignore_index=ignore_index)
-
-    def time_f_ordered(self, axis, ignore_index):
-        with warnings.catch_warnings(record=True):
-            concat(self.panels_f, axis=axis, ignore_index=ignore_index)
-
-
 class ConcatDataFrames(object):
 
     params = ([0, 1], [True, False])

asv_bench/benchmarks/panel_ctor.py

@@ -113,4 +113,20 @@ def time_quantile(self, constructor, window, dtype, percentile,
         self.roll.quantile(percentile, interpolation=interpolation)
 
 
+class PeakMemFixed(object):
+
+    def setup(self):
+        N = 10
+        arr = 100 * np.random.random(N)
+        self.roll = pd.Series(arr).rolling(10)
+
+    def peakmem_fixed(self):
+        # GH 25926
+        # This is to detect memory leaks in rolling operations.
+        # To save time this is only ran on one method.
+        # 6000 iterations is enough for most types of leaks to be detected
+        for x in range(6000):
+            self.roll.max()
+
+
 from .pandas_vb_common import setup  # noqa: F401

asv_bench/benchmarks/panel_methods.py

@@ -10,7 +10,6 @@ jobs:
     name: Linux
     vmImage: ubuntu-16.04
 
-# Windows Python 2.7 needs VC 9.0 installed, handled in the template
 - template: ci/azure/windows.yml
   parameters:
     name: Windows
@@ -40,9 +39,8 @@ jobs:
   - script: |
       export PATH=$HOME/miniconda3/bin:$PATH
       sudo apt-get install -y libc6-dev-i386
-      ci/incremental/install_miniconda.sh
-      ci/incremental/setup_conda_environment.sh
-    displayName: 'Set up environment'
+      ci/setup_env.sh
+    displayName: 'Setup environment and build pandas'
     condition: true
 
   # Do not require pandas
@@ -60,13 +58,6 @@ jobs:
     displayName: 'Dependencies consistency'
     condition: true
 
-  - script: |
-      export PATH=$HOME/miniconda3/bin:$PATH
-      source activate pandas-dev
-      ci/incremental/build.sh
-    displayName: 'Build'
-    condition: true
-
   # Require pandas
   - script: |
       export PATH=$HOME/miniconda3/bin:$PATH
@@ -89,6 +80,13 @@ jobs:
     displayName: 'Docstring validation'
     condition: true
 
+  - script: |
+      export PATH=$HOME/miniconda3/bin:$PATH
+      source activate pandas-dev
+      ci/code_checks.sh typing
+    displayName: 'Typing validation'
+    condition: true
+
   - script: |
       export PATH=$HOME/miniconda3/bin:$PATH
       source activate pandas-dev