Merge branch 'master' into issue-9606

Author: Oleksii Polovyi

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Whether you are a novice or experienced software developer, all contributions and suggestions are welcome!
 
-Our main contributing guide can be found [in this repo](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst) or [on the website](https://pandas-docs.github.io/pandas-docs-travis/contributing.html). If you do not want to read it in its entirety, we will summarize the main ways in which you can contribute and point to relevant sections of that document for further information.
+Our main contributing guide can be found [in this repo](https://github.com/pandas-dev/pandas/blob/master/doc/source/development/contributing.rst) or [on the website](https://pandas-docs.github.io/pandas-docs-travis/development/contributing.html). If you do not want to read it in its entirety, we will summarize the main ways in which you can contribute and point to relevant sections of that document for further information.
 
 ## Getting Started
 
@@ -18,6 +18,6 @@ If you notice a bug in the code or documentation, or have suggestions for how we
 
 The code is hosted on [GitHub](https://www.github.com/pandas-dev/pandas), so you will need to use [Git](http://git-scm.com/) to clone the project and make changes to the codebase. Once you have obtained a copy of the code, you should create a development environment that is separate from your existing Python environment so that you can make and test changes without compromising your own work environment. For more information, please refer to the "[Working with the code](https://github.com/pandas-dev/pandas/blob/master/doc/source/development/contributing.rst#working-with-the-code)" section.
 
-Before submitting your changes for review, make sure to check that your changes do not break any tests. You can find more information about our test suites in the "[Test-driven development/code writing](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#test-driven-development-code-writing)" section. We also have guidelines regarding coding style that will be enforced during testing, which can be found in the "[Code standards](https://github.com/pandas-dev/pandas/blob/master/doc/source/development/contributing.rst#code-standards)" section.
+Before submitting your changes for review, make sure to check that your changes do not break any tests. You can find more information about our test suites in the "[Test-driven development/code writing](https://github.com/pandas-dev/pandas/blob/master/doc/source/development/contributing.rst#test-driven-development-code-writing)" section. We also have guidelines regarding coding style that will be enforced during testing, which can be found in the "[Code standards](https://github.com/pandas-dev/pandas/blob/master/doc/source/development/contributing.rst#code-standards)" section.
 
 Once your changes are ready to be submitted, make sure to push your changes to GitHub before creating a pull request. Details about how to do that can be found in the "[Contributing your changes to pandas](https://github.com/pandas-dev/pandas/blob/master/doc/source/development/contributing.rst#contributing-your-changes-to-pandas)" section. We will review your changes, and you will most likely be asked to make additional changes before it is finally ready to merge. However, once it's ready, we will merge it, and you will have successfully contributed to the codebase!

.gitignore

@@ -61,9 +61,11 @@ dist
 .coverage
 coverage.xml
 coverage_html_report
+.mypy_cache
 *.pytest_cache
 # hypothesis test database
 .hypothesis/
+__pycache__
 
 # OS generated files #
 ######################

.pep8speaks.yml

@@ -2,18 +2,3 @@
 
 scanner:
     diff_only: True  # If True, errors caused by only the patch are shown
-
-# Opened issue in pep8speaks, so we can directly use the config in setup.cfg
-# (and avoid having to duplicate it here):
-# https://github.com/OrkoHunter/pep8speaks/issues/95
-
-pycodestyle:
-    max-line-length: 79
-    ignore:
-        - W503,  # line break before binary operator
-        - W504,  # line break after binary operator
-        - E402,  # module level import not at top of file
-        - E731,  # do not assign a lambda expression, use a def
-        - C406,  # Unnecessary list literal - rewrite as a dict literal.
-        - C408,  # Unnecessary dict call - rewrite as a literal.
-        - C409   # Unnecessary list passed to tuple() - rewrite as a tuple literal.

.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
@@ -60,14 +51,14 @@ matrix:
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
+        - JOB="3.6, doc" ENV_FILE="environment.yml" DOC=true
     allow_failures:
       - dist: trusty
         env:
           - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
       - dist: trusty
         env:
-          - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
+          - JOB="3.6, doc" ENV_FILE="environment.yml" DOC=true
 
 before_install:
   - echo "before_install"
@@ -91,14 +82,17 @@ 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
+  # display server (for clipboard functionality) needs to be started here,
+  # does not work if done in install:setup_env.sh (GH-26103)
   - export DISPLAY=":99.0"
-  - ci/before_script_travis.sh
+  - echo "sh -e /etc/init.d/xvfb start"
+  - sh -e /etc/init.d/xvfb start
+  - sleep 3
 
 script:
   - echo "script start"

LICENSES/SIX

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

README.md

@@ -13,7 +13,7 @@
         pass
 
 
-class Factorize(object):
+class Factorize:
 
     params = [[True, False], ['int', 'uint', 'float', 'string']]
     param_names = ['sort', 'dtype']
@@ -30,7 +30,7 @@ def time_factorize(self, sort, dtype):
         self.idx.factorize(sort=sort)
 
 
-class FactorizeUnique(object):
+class FactorizeUnique:
 
     params = [[True, False], ['int', 'uint', 'float', 'string']]
     param_names = ['sort', 'dtype']
@@ -48,7 +48,7 @@ def time_factorize(self, sort, dtype):
         self.idx.factorize(sort=sort)
 
 
-class Duplicated(object):
+class Duplicated:
 
     params = [['first', 'last', False], ['int', 'uint', 'float', 'string']]
     param_names = ['keep', 'dtype']
@@ -67,7 +67,7 @@ def time_duplicated(self, keep, dtype):
         self.idx.duplicated(keep=keep)
 
 
-class DuplicatedUniqueIndex(object):
+class DuplicatedUniqueIndex:
 
     params = ['int', 'uint', 'float', 'string']
     param_names = ['dtype']
@@ -86,7 +86,7 @@ def time_duplicated_unique(self, dtype):
         self.idx.duplicated()
 
 
-class Hashing(object):
+class Hashing:
 
     def setup_cache(self):
         N = 10**5
@@ -124,7 +124,7 @@ def time_series_dates(self, df):
         hashing.hash_pandas_object(df['dates'])
 
 
-class Quantile(object):
+class Quantile:
     params = [[0, 0.5, 1],
               ['linear', 'nearest', 'lower', 'higher', 'midpoint'],
               ['float', 'int', 'uint']]

asv_bench/benchmarks/algorithms.py

@@ -6,7 +6,7 @@
     from pandas.util.decorators import cache_readonly
 
 
-class DataFrameAttributes(object):
+class DataFrameAttributes:
 
     def setup(self):
         self.df = DataFrame(np.random.randn(10, 6))
@@ -19,7 +19,7 @@ def time_set_index(self):
         self.df.index = self.cur_index
 
 
-class CacheReadonly(object):
+class CacheReadonly:
 
     def setup(self):
 

asv_bench/benchmarks/attrs_caching.py

@@ -7,7 +7,7 @@
     import pandas.computation.expressions as expr
 
 
-class Ops(object):
+class Ops:
 
     params = [[True, False], ['default', 1]]
     param_names = ['use_numexpr', 'threads']
@@ -38,7 +38,7 @@ def teardown(self, use_numexpr, threads):
         expr.set_numexpr_threads()
 
 
-class Ops2(object):
+class Ops2:
 
     def setup(self):
         N = 10**3
@@ -88,7 +88,7 @@ def time_frame_series_dot(self):
         self.df.dot(self.s)
 
 
-class Timeseries(object):
+class Timeseries:
 
     params = [None, 'US/Eastern']
     param_names = ['tz']
@@ -114,7 +114,7 @@ def time_timestamp_ops_diff_with_shift(self, tz):
         self.s - self.s.shift()
 
 
-class AddOverflowScalar(object):
+class AddOverflowScalar:
 
     params = [1, -1, 0]
     param_names = ['scalar']
@@ -127,7 +127,7 @@ def time_add_overflow_scalar(self, scalar):
         checked_add_with_arr(self.arr, scalar)
 
 
-class AddOverflowArray(object):
+class AddOverflowArray:
 
     def setup(self):
         N = 10**6

asv_bench/benchmarks/binary_ops.py

@@ -12,7 +12,7 @@
         pass
 
 
-class Concat(object):
+class Concat:
 
     def setup(self):
         N = 10**5
@@ -28,7 +28,7 @@ def time_union(self):
         union_categoricals([self.a, self.b])
 
 
-class Constructor(object):
+class Constructor:
 
     def setup(self):
         N = 10**5
@@ -77,7 +77,7 @@ def time_existing_series(self):
         pd.Categorical(self.series)
 
 
-class ValueCounts(object):
+class ValueCounts:
 
     params = [True, False]
     param_names = ['dropna']
@@ -92,7 +92,7 @@ def time_value_counts(self, dropna):
         self.ts.value_counts(dropna=dropna)
 
 
-class Repr(object):
+class Repr:
 
     def setup(self):
         self.sel = pd.Series(['s1234']).astype('category')
@@ -101,7 +101,7 @@ def time_rendering(self):
         str(self.sel)
 
 
-class SetCategories(object):
+class SetCategories:
 
     def setup(self):
         n = 5 * 10**5
@@ -113,7 +113,7 @@ def time_set_categories(self):
         self.ts.cat.set_categories(self.ts.cat.categories[::2])
 
 
-class RemoveCategories(object):
+class RemoveCategories:
 
     def setup(self):
         n = 5 * 10**5
@@ -125,7 +125,7 @@ def time_remove_categories(self):
         self.ts.cat.remove_categories(self.ts.cat.categories[::2])
 
 
-class Rank(object):
+class Rank:
 
     def setup(self):
         N = 10**5
@@ -162,7 +162,7 @@ def time_rank_int_cat_ordered(self):
         self.s_int_cat_ordered.rank()
 
 
-class Isin(object):
+class Isin:
 
     params = ['object', 'int64']
     param_names = ['dtype']
@@ -181,7 +181,7 @@ def time_isin_categorical(self, dtype):
         self.series.isin(self.sample)
 
 
-class IsMonotonic(object):
+class IsMonotonic:
 
     def setup(self):
         N = 1000
@@ -201,7 +201,7 @@ def time_categorical_series_is_monotonic_decreasing(self):
         self.s.is_monotonic_decreasing
 
 
-class Contains(object):
+class Contains:
 
     def setup(self):
         N = 10**5
@@ -216,7 +216,7 @@ def time_categorical_contains(self):
         self.key in self.c
 
 
-class CategoricalSlicing(object):
+class CategoricalSlicing:
 
     params = ['monotonic_incr', 'monotonic_decr', 'non_monotonic']
     param_names = ['index']
@@ -257,7 +257,7 @@ def time_getitem_bool_array(self, index):
         self.data[self.data == self.cat_scalar]
 
 
-class Indexing(object):
+class Indexing:
 
     def setup(self):
         N = 10**5