Drop support for legacy Python 2.7 (#235)

* sudo no longer needed https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration

* Drop the dot https://twitter.com/pytestdotorg/status/753767547866972160

* Drop support for legacy Python 2.7

* Upgrade Python syntax with pyupgrade

* Upgrade Python syntax with pyupgrade --py3-plus

* The future is now

* Fix classifier

* Add support for Python 3.7

Author: hugovk

.travis.yml

@@ -1,22 +1,21 @@
-sudo: False
-
 language: python
 
 cache: pip
 
 matrix:
   include:
-    - python: 2.7
     - python: 3.5
     - python: 3.5
       env: NUMPY_VERSION="<1.14.0"
     - python: 3.6
+    - python: 3.7
+      dist: xenial
 
 install:
   - ./ci/01-install.sh
 
 script:
-  - py.test
+  - pytest
 
 after_success:
   - codecov

benchmarks/benchmark_coo.py

@@ -3,7 +3,7 @@
 import sparse
 
 
-class ElemwiseSuite(object):
+class ElemwiseSuite:
     def setup(self):
         np.random.seed(0)
         self.x = sparse.random((100, 100, 100), density=0.01)
@@ -21,7 +21,7 @@ def time_index(self):
         self.x[5]
 
 
-class ElemwiseBroadcastingSuite(object):
+class ElemwiseBroadcastingSuite:
     def setup(self):
         np.random.seed(0)
         self.x = sparse.random((100, 1, 100), density=0.01)
@@ -34,7 +34,7 @@ def time_mul(self):
         self.x * self.y
 
 
-class IndexingSuite(object):
+class IndexingSuite:
     def setup(self):
         np.random.seed(0)
         self.x = sparse.random((100, 100, 100), density=0.01)

ci/environment-2.7.yml renamed to ci/environment-3.7.yml

@@ -1,8 +1,8 @@
-name: py27-sparse-test
+name: py37-sparse-test
 channels:
   - conda-forge
 dependencies:
-  - python=2.7
+  - python=3.7
   - pytest
   - numpy
   - scipy

docs/contributing.rst

@@ -60,17 +60,14 @@ Running/Adding Unit Tests
 It is best if all new functionality and/or bug fixes have unit tests added
 with each use-case.
 
-Since we support both Python 2.7 and Python 3.5 and newer, it is recommended
-to test with at least these two versions before committing your code or opening
-a pull request. We use `pytest <https://docs.pytest.org/en/latest/>`_ as our unit
-testing framework, with the ``pytest-cov`` extension to check code coverage and
-``pytest-flake8`` to check code style. You don't need to configure these extensions
-yourself. Once you've configured your environment, you can just ``cd`` to
-the root of your repository and run
+We use `pytest <https://docs.pytest.org/en/latest/>`_ as our unit testing framework,
+with the ``pytest-cov`` extension to check code coverage and ``pytest-flake8`` to
+check code style. You don't need to configure these extensions yourself. Once you've
+configured your environment, you can just ``cd`` to the root of your repository and run
 
 .. code-block:: bash
 
-   py.test
+   pytest
 
 This automatically checks code style and functionality, and prints code coverage,
 even though it doesn't fail on low coverage.
@@ -80,7 +77,7 @@ Unit tests are automatically run on Travis CI for pull requests.
 Coverage
 --------
 
-The ``py.test`` script automatically reports coverage, both on the terminal for
+The ``pytest`` script automatically reports coverage, both on the terminal for
 missing line numbers, and in annotated HTML form in ``htmlcov/index.html``.
 
 Coverage is automatically checked on CodeCov for pull requests.

readthedocs.yml

@@ -2,7 +2,7 @@ build:
   image: latest
 
 python:
-  version: 3.6
+  version: 3.7
   pip_install: true
   extra_requirements:
     - docs

setup.py

@@ -56,11 +56,11 @@
         'Operating System :: OS Independent',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3 :: Only',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
     ],
@@ -69,5 +69,5 @@
         'Source': 'https://github.com/pydata/sparse/',
         'Tracker': 'https://github.com/pydata/sparse/issues',
     },
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
+    python_requires='>=3.5, <4',
 )

sparse/compatibility.py

@@ -1,17 +1,13 @@
 from functools import reduce, wraps
 import operator
 import warnings
-try:
-    from collections.abc import Iterable
-except (AttributeError, ImportError):
-    from collections import Iterable
+from collections.abc import Iterable
 
 import numpy as np
 import scipy.sparse
 import numba
 
 from ..sparse_array import SparseArray
-from ..compatibility import range, int
 from ..utils import isscalar, normalize_axis, check_zero_fill_value, check_consistent_fill_value
 
 
@@ -438,7 +434,7 @@ def stack(arrays, axis=0):
     from .core import COO
     check_consistent_fill_value(arrays)
 
-    assert len(set(x.shape for x in arrays)) == 1
+    assert len({x.shape for x in arrays}) == 1
     arrays = [x if isinstance(x, COO) else COO(x) for x in arrays]
     axis = normalize_axis(axis, arrays[0].ndim + 1)
     data = np.concatenate([x.data for x in arrays])

sparse/coo/common.py

@@ -1,9 +1,6 @@
 import copy as _copy
 import operator
-try:
-    from collections.abc import Iterable, Iterator, Sized
-except (AttributeError, ImportError):
-    from collections import Iterable, Iterator, Sized
+from collections.abc import Iterable, Iterator, Sized
 from collections import defaultdict, deque
 from functools import reduce
 import warnings
@@ -15,7 +12,6 @@
 from .common import dot, matmul
 from .indexing import getitem
 from .umath import elemwise, broadcast_to
-from ..compatibility import int, range
 from ..sparse_array import SparseArray
 from ..utils import normalize_axis, equivalent, check_zero_fill_value, _zero_of_dtype
 
@@ -226,7 +222,7 @@ def __init__(self, coords, data=None, shape=None, has_duplicates=True,
             else:
                 shape = ()
 
-        super(COO, self).__init__(shape, fill_value=fill_value)
+        super().__init__(shape, fill_value=fill_value)
         self.coords = self.coords.astype(np.intp)
 
         if self.shape:
@@ -278,7 +274,7 @@ def copy(self, deep=True):
     def _make_shallow_copy_of(self, other):
         self.coords = other.coords
         self.data = other.data
-        super(COO, self).__init__(other.shape, fill_value=other.fill_value)
+        super().__init__(other.shape, fill_value=other.fill_value)
 
     def enable_caching(self):
         """ Enable caching of reshape, transpose, and tocsr/csc operations

sparse/coo/core.py

@@ -3,7 +3,8 @@
 import numba
 import numpy as np
 
-from ..compatibility import range, zip_longest
+from itertools import zip_longest
+
 from ..slicing import normalize_index
 from ..utils import _zero_of_dtype, equivalent
 
@@ -582,7 +583,7 @@ def _join_adjacent_pairs(starts_old, stops_old):  # pragma: no cover
     return starts, stops
 
 
-class _AdvIdxInfo(object):
+class _AdvIdxInfo:
     def __init__(self, idx, pos, length):
         self.idx = idx
         self.pos = pos

sparse/coo/indexing.py

@@ -4,7 +4,8 @@
 import numpy as np
 import scipy.sparse
 
-from ..compatibility import range, zip, zip_longest
+from itertools import zip_longest
+
 from ..utils import isscalar, equivalent, _zero_of_dtype
 
 
@@ -379,7 +380,7 @@ def broadcast_to(x, shape):
                sorted=sorted, fill_value=x.fill_value)
 
 
-class _Elemwise(object):
+class _Elemwise:
     def __init__(self, func, *args, **kwargs):
         """
         Initialize the element-wise function calculator.

sparse/coo/umath.py

@@ -5,7 +5,6 @@
 from .slicing import normalize_index
 from .utils import equivalent
 from .sparse_array import SparseArray
-from .compatibility import int, range, zip
 
 
 class DOK(SparseArray):
@@ -108,7 +107,7 @@ def __init__(self, shape, data=None, dtype=None, fill_value=None):
         if not data:
             data = dict()
 
-        super(DOK, self).__init__(shape, fill_value=fill_value)
+        super().__init__(shape, fill_value=fill_value)
 
         if isinstance(data, dict):
             if not dtype:
@@ -125,7 +124,7 @@ def __init__(self, shape, data=None, dtype=None, fill_value=None):
     def _make_shallow_copy_of(self, other):
         self.dtype = other.dtype
         self.data = other.data
-        super(DOK, self).__init__(other.shape, fill_value=other.fill_value)
+        super().__init__(other.shape, fill_value=other.fill_value)
 
     @classmethod
     def from_coo(cls, x):

sparse/dok.py

@@ -2,11 +2,8 @@
 # See license at https://github.com/dask/dask/blob/master/LICENSE.txt
 
 import math
+from collections.abc import Iterable
 from numbers import Integral, Number
-try:
-    from collections.abc import Iterable
-except (AttributeError, ImportError):
-    from collections import Iterable
 
 import numpy as np
 

sparse/slicing.py

@@ -1,20 +1,15 @@
-from __future__ import absolute_import, division, print_function
 from abc import ABCMeta, abstractmethod
-try:
-    from collections.abc import Iterable
-except (AttributeError, ImportError):
-    from collections import Iterable
+from collections.abc import Iterable
 from numbers import Integral
 from functools import reduce
 import operator
 
 import numpy as np
 
 from .utils import _zero_of_dtype
-from .compatibility import int
 
 
-class SparseArray(object):
+class SparseArray:
     """
     An abstract base class for all the sparse array classes.
 

sparse/sparse_array.py

@@ -1382,7 +1382,6 @@ def test_create_with_lists_of_tuples():
 
 
 def test_sizeof():
-    import sys
     x = np.eye(100)
     y = COO.from_numpy(x)
 
@@ -1832,7 +1831,7 @@ def test_prod_along_axis():
     assert_eq(s2.prod(axis=0), x2.prod(axis=0))
 
 
-class TestRoll(object):
+class TestRoll:
 
     # test on 1d array #
     @pytest.mark.parametrize('shift', [0, 2, -2, 20, -20])
@@ -1920,7 +1919,7 @@ def test_clip():
     assert_eq(out, x.clip(min=1, max=3))
 
 
-class TestFailFillValue(object):
+class TestFailFillValue:
     # Check failed fill_value op
     def test_nonzero_fv(self):
         xs = sparse.random((2, 3), density=0.5, fill_value=1)
@@ -2054,7 +2053,6 @@ def test_out_dtype():
         np.positive(a.todense(), out=b.todense(), dtype='float64').dtype
 
 
-@pytest.mark.skipif(sys.version_info[0] == 2, reason='Test won\'t run on Py2.')
 def test_failed_densification():
     import os
     from importlib import reload
@@ -2072,7 +2070,6 @@ def test_failed_densification():
     reload(sparse)
 
 
-@pytest.mark.skipif(sys.version_info[0] == 2, reason='Test won\'t run on Py2.')
 def test_warn_on_too_dense():
     import os
     from importlib import reload

sparse/tests/test_coo.py

@@ -1,7 +1,6 @@
 import pytest
 
 import numpy as np
-import six
 
 import sparse
 from sparse import DOK
@@ -72,7 +71,7 @@ def test_construct(shape, data):
     s = DOK(shape, data)
     x = np.zeros(shape, dtype=s.dtype)
 
-    for c, d in six.iteritems(data):
+    for c, d in data.items():
         x[c] = d
 
     assert_eq(x, s)

sparse/tests/test_dok.py

@@ -1,8 +1,5 @@
 import functools
-try:
-    from collections.abc import Iterable
-except (AttributeError, ImportError):
-    from collections import Iterable
+from collections.abc import Iterable
 from numbers import Integral
 
 import numpy as np

sparse/utils.py

@@ -1,8 +1,8 @@
 [tox]
-envlist = py27,py36
+envlist = py36, py37
 [testenv]
 commands=
-    py.test {posargs}
+    pytest {posargs}
 extras=
     tests
     tox