Merge branch 'master' into excel-read-shared-init-to-baseclass

Author: tdamsma

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

asv_bench/benchmarks/offset.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import warnings
 from datetime import datetime
 

ci/code_checks.sh

@@ -126,6 +126,10 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
     invgrep -r -E --include '*.py' "[[:space:]] pytest.raises" pandas/tests/
     RET=$(($RET + $?)) ; echo $MSG "DONE"
 
+    MSG='Check for python2-style file encodings' ; echo $MSG
+    invgrep -R --include="*.py" --include="*.pyx" -E "# -\*- coding: utf-8 -\*-" pandas scripts
+    RET=$(($RET + $?)) ; echo $MSG "DONE"
+
     # Check for the following code in testing: `np.testing` and `np.array_equal`
     MSG='Check for invalid testing' ; echo $MSG
     invgrep -r -E --include '*.py' --exclude testing.py '(numpy|np)(\.testing|\.array_equal)' pandas/tests/

doc/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # pandas documentation build configuration file, created by
 #

doc/source/whatsnew/v0.25.0.rst

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # flake8: noqa
 
 from .tslibs import (

pandas/_libs/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 from cython import Py_ssize_t
 

pandas/_libs/algos.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 from cython import Py_ssize_t
 from cython cimport floating

pandas/_libs/groupby.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Translated from the reference implementation
 # at https://github.com/veorq/SipHash
 

pandas/_libs/hashing.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 cimport cython
 
 from cpython cimport (PyObject, Py_INCREF,

pandas/_libs/hashtable.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime, timedelta, date
 
 import cython

pandas/_libs/index.pyx

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 cdef class _NDFrameIndexerBase:
     """
     A base class for _NDFrameIndexer for fast instantiation and attribute

pandas/_libs/indexing.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 from cython import Py_ssize_t
 

pandas/_libs/internals.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import numbers
 from operator import le, lt
 

pandas/_libs/interval.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 from cython import Py_ssize_t
 

pandas/_libs/join.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from decimal import Decimal
 from fractions import Fraction
 from numbers import Number

pandas/_libs/lib.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 from cython import Py_ssize_t
 

pandas/_libs/missing.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import operator
 
 from cpython cimport (PyObject_RichCompareBool,

pandas/_libs/ops.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from cython import Py_ssize_t
 
 from cpython cimport (

pandas/_libs/properties.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from distutils.version import LooseVersion
 
 from cython import Py_ssize_t

pandas/_libs/reduction.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 from cython import Py_ssize_t
 

pandas/_libs/reshape.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import cython
 
 import numpy as np

pandas/_libs/sparse.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import cython
 
 from cpython.datetime cimport (PyDateTime_Check, PyDate_Check,

pandas/_libs/tslib.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # flake8: noqa
 
 from .conversion import normalize_date, localize_pydatetime

pandas/_libs/tslibs/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 _Timestamp is a c-defined subclass of datetime.datetime
 

pandas/_libs/tslibs/c_timestamp.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # cython: boundscheck=False
 """
 Cython implementations of functions resembling the stdlib calendar module

pandas/_libs/tslibs/ccalendar.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import cython
 
 import numpy as np

pandas/_libs/tslibs/conversion.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Functions for accessing attributes of Timestamp/datetime64/datetime-like
 objects and arrays

pandas/_libs/tslibs/fields.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import re
 
 cimport numpy as cnp

pandas/_libs/tslibs/frequencies.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from cpython cimport (
     PyObject_RichCompare,
     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE)

pandas/_libs/tslibs/nattype.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from cpython cimport Py_EQ, Py_NE, Py_GE, Py_GT, Py_LT, Py_LE
 
 from cpython.datetime cimport (datetime, date,

pandas/_libs/tslibs/np_datetime.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 
 import time

pandas/_libs/tslibs/offsets.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Parsing functions for datetime and datetime-like strings.
 """

pandas/_libs/tslibs/parsing.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from cpython cimport (

pandas/_libs/tslibs/period.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import numpy as np
 from numpy cimport ndarray, int64_t, int32_t
 

pandas/_libs/tslibs/resolution.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Strptime-related classes and functions.
 """
 import time

pandas/_libs/tslibs/strptime.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import collections
 import textwrap
 import warnings
@@ -777,11 +776,14 @@ cdef class _Timedelta(timedelta):
                     return PyObject_RichCompare(np.array([self]), other, op)
                 return PyObject_RichCompare(other, self, reverse_ops[op])
             else:
-                if op == Py_EQ:
+                if other is NaT:
+                    return PyObject_RichCompare(other, self, reverse_ops[op])
+                elif op == Py_EQ:
                     return False
                 elif op == Py_NE:
                     return True
-                raise TypeError('Cannot compare type {cls} with type {other}'
+                raise TypeError('Cannot compare type {cls} with '
+                                'type {other}'
                                 .format(cls=type(self).__name__,
                                         other=type(other).__name__))
 

pandas/_libs/tslibs/timedeltas.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import sys
 import warnings
 

pandas/_libs/tslibs/timestamps.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import timezone
 
 # dateutil compat

pandas/_libs/tslibs/timezones.pyx

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # cython: boundscheck=False, wraparound=False, cdivision=True
 
 import cython

pandas/_libs/window.pyx

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import cython
 from cython import Py_ssize_t
 

pandas/_libs/writers.pyx

@@ -221,6 +221,19 @@ def all_compare_operators(request):
     return request.param
 
 
+@pytest.fixture(params=['__le__', '__lt__', '__ge__', '__gt__'])
+def compare_operators_no_eq_ne(request):
+    """
+    Fixture for dunder names for compare operations except == and !=
+
+    * >=
+    * >
+    * <
+    * <=
+    """
+    return request.param
+
+
 @pytest.fixture(params=[None, 'gzip', 'bz2', 'zip', 'xz'])
 def compression(request):
     """

pandas/conftest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 
 accessor.py contains base classes for implementing accessor properties

pandas/core/accessor.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Helper functions to generate range-like data for DatetimeArray
 (and possibly TimedeltaArray/PeriodArray)

pandas/core/arrays/_ranges.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime, timedelta
 import operator
 from typing import Any, Sequence, Tuple, Type, Union

pandas/core/arrays/datetimelike.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime, time, timedelta
 import textwrap
 from typing import Union

pandas/core/arrays/datetimes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import timedelta
 import operator
 from typing import Any, Callable, Optional, Sequence, Union

pandas/core/arrays/period.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import timedelta
 import textwrap
 import warnings

pandas/core/arrays/timedeltas.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Base and utility classes for tseries type pandas objects.
 """

pandas/core/indexes/datetimelike.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from .blocks import (  # noqa:F401
     _block_shape,   # io.pytables
     _safe_reshape,  # io.packers

pandas/core/internals/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import date, datetime, timedelta
 import functools
 import inspect

pandas/core/internals/blocks.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # TODO: Needs a better name; too many modules are already called "concat"
 from collections import defaultdict
 import copy

pandas/core/internals/concat.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collections import defaultdict
 from functools import partial
 import itertools

pandas/core/internals/managers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import codecs
 import re
 import textwrap

pandas/core/strings.py

@@ -938,6 +938,7 @@ def count(self):
             result = b.notna().astype(int)
             result = self._constructor(result, window=window, min_periods=0,
                                        center=self.center,
+                                       axis=self.axis,
                                        closed=self.closed).sum()
             results.append(result)
 

pandas/core/window.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Module for formatting output data into CSV files.
 """

pandas/io/formats/csvs.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Internal module for formatting output data in csv, html,
 and latex files. This module also applies to display formatting.

pandas/io/formats/format.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Module for formatting output data in HTML.
 """

pandas/io/formats/html.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Module for formatting output data in Latex.
 """

pandas/io/formats/latex.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Collection of query wrappers / abstractions to both facilitate data
 retrieval and to reduce dependency on DB-specific API.

pandas/io/sql.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pandas as pd
 from pandas import api
 from pandas.util import testing as tm

pandas/tests/api/test_api.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from pandas.api import types
 from pandas.util import testing as tm
 

pandas/tests/api/test_types.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import numpy as np
 import pytest