Merge pull request #29 from pllim/fix-ci

TST: Fix CI

Author: pllim

pytest_arraydiff/plugin.py

@@ -36,26 +36,17 @@
 import shutil
 import tempfile
 import warnings
-
-import six
-from six.moves.urllib.request import urlopen
+from urllib.request import urlopen
 
 import pytest
 import numpy as np
 
 
-if six.PY2:
-    def abstractstaticmethod(func):
-        return func
-    def abstractclassmethod(func):
-        return func
-else:
-    abstractstaticmethod = abc.abstractstaticmethod
-    abstractclassmethod = abc.abstractclassmethod
+abstractstaticmethod = abc.abstractstaticmethod
+abstractclassmethod = abc.abstractclassmethod
 
 
-@six.add_metaclass(abc.ABCMeta)
-class BaseDiff(object):
+class BaseDiff(object, metaclass=abc.ABCMeta):
 
     @abstractstaticmethod
     def read(filename):
@@ -142,14 +133,7 @@ def read(filename):
     @staticmethod
     def write(filename, data, **kwargs):
         fmt = kwargs.get('fmt', '%g')
-        # Workaround for a known issue in `numpy.savetxt` for the `fmt` argument:
-        # https://github.com/numpy/numpy/pull/4053#issuecomment-263808221
-        # Convert `unicode` to `str` (i.e. bytes) on Python 2
-        if six.PY2 and isinstance(fmt, six.text_type):
-            fmt = fmt.encode('ascii')
-
         kwargs['fmt'] = fmt
-
         return np.savetxt(filename, data, **kwargs)
 
 

setup.cfg

@@ -45,4 +45,4 @@ markers =
     array_compare : for functions using array comparison
 
 [flake8]
-max-line-length = 100
+max-line-length = 150