Merge pull request #907 from a-detiste/master

remove Python2 crumbs

docs/conf.py

@@ -192,4 +192,4 @@
 #         continue
 #     dtype, target = line.split(None, 1)
 #     target = target.strip()
-#     nitpick_ignore.append((dtype, six.u(target)))
+#     nitpick_ignore.append((dtype, str(target)))

docs/installing.rst

@@ -20,7 +20,6 @@ This package has the following dependencies:
 * `dask <https://dask.org/>`_, used for the :class:`~spectral_cube.DaskSpectralCube` class
 * `zarr <https://zarr.readthedocs.io/en/stable/>`_ and `fsspec <https://pypi.org/project/fsspec/>`_,
   used for storing computations to disk when using the dask-enabled classes.
-* `six <http://pypi.python.org/pypi/six/>`_
 * `casa-formats-io <https://pypi.org/project/casa-formats-io>`_
 
 Installation

setup.cfg

@@ -17,7 +17,6 @@ install_requires =
     astropy
     numpy>=1.8.0
     radio_beam>=0.3.3
-    six
     dask[array]
     joblib
     casa-formats-io

spectral_cube/_moments.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import numpy as np
 
 from .cube_utils import iterator_strategy

spectral_cube/analysis_utilities.py

@@ -1,7 +1,6 @@
 import numpy as np
 
 from astropy import units as u
-from six.moves import zip, range
 from astropy.wcs import WCS
 from astropy import log
 import warnings

spectral_cube/conftest.py

@@ -1,7 +1,6 @@
 # this contains imports plugins that configure py.test for astropy tests.
 # by importing them here in conftest.py they are discoverable by py.test
 # no matter how it is invoked within the source tree.
-from __future__ import print_function, absolute_import, division
 
 import os
 from astropy.units.equivalencies import pixel_scale

spectral_cube/cube_utils.py

@@ -1,14 +1,8 @@
-from __future__ import print_function, absolute_import, division
-
 import contextlib
 import warnings
 from copy import deepcopy
 
-try:
-    import builtins
-except ImportError:
-    # python2
-    import __builtin__ as builtins
+import builtins
 
 import dask.array as da
 import numpy as np

spectral_cube/dask_spectral_cube.py

@@ -2,8 +2,6 @@
 A class to represent a 3-d position-position-velocity spectral cube.
 """
 
-from __future__ import print_function, absolute_import, division
-
 import uuid
 import inspect
 import warnings

spectral_cube/io/__init__.py

@@ -1 +0,0 @@
-from __future__ import print_function, absolute_import, division

spectral_cube/io/casa_image.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import warnings
 from astropy import units as u
 from astropy.io import registry as io_registry

spectral_cube/io/casa_masks.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import numpy as np
 from astropy.io import fits
 import tempfile

spectral_cube/io/class_lmv.py

@@ -1,6 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
-import six
 import numpy as np
 import struct
 import warnings
@@ -252,8 +249,8 @@ def read_lmv_tofits(fileobj):
              if isinstance(v, tuple) else
              fits.header.Card(''.join(s for s in k if s in string.printable),
                               ''.join(s for s in v if s in string.printable)
-                              if isinstance(v, six.string_types) else v)
-             for k,v in six.iteritems(header)
+                              if isinstance(v, str) else v)
+             for k,v in header.items()
              if k not in bad_kws]
     Header = fits.Header(cards)
     hdu = fits.PrimaryHDU(data=data, header=Header)

spectral_cube/io/core.py

@@ -5,8 +5,6 @@
 # the unified I/O framework from Astropy which is used to implement this, see
 # http://docs.astropy.org/en/stable/io/unified.html
 
-from __future__ import print_function, absolute_import, division
-
 from pathlib import PosixPath
 import warnings
 

spectral_cube/io/fits.py

@@ -1,6 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
-import six
 import dask
 import warnings
 

spectral_cube/lower_dimensional_structures.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import warnings
 
 import numpy as np

spectral_cube/masks.py

@@ -1,11 +1,8 @@
-from __future__ import print_function, absolute_import, division
-
 import abc
 import uuid
 import warnings
 import tempfile
 
-from six.moves import zip
 import numpy as np
 from numpy.lib.stride_tricks import as_strided
 

spectral_cube/np_compat.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import numpy as np
 
 def allbadtonan(function):

spectral_cube/spectral_axis.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import numpy as np
 
 from astropy import wcs

spectral_cube/spectral_cube.py

@@ -2,8 +2,6 @@
 A class to represent a 3-d position-position-velocity spectral cube.
 """
 
-from __future__ import print_function, absolute_import, division
-
 import warnings
 from functools import wraps
 import operator
@@ -13,8 +11,6 @@
 import tempfile
 import textwrap
 from pathlib import PosixPath
-import six
-from six.moves import zip, range
 import dask.array as da
 
 import astropy.wcs
@@ -2048,7 +2044,7 @@ def subcube_from_ds9region(self, ds9_region, allow_empty=False):
         """
         import regions
 
-        if isinstance(ds9_region, six.string_types):
+        if isinstance(ds9_region, str):
             if hasattr(regions, 'DS9Parser'):
                 region_list = regions.DS9Parser(ds9_region).shapes.to_regions()
             else:
@@ -2072,7 +2068,7 @@ def subcube_from_crtfregion(self, crtf_region, allow_empty=False):
         """
         import regions
 
-        if isinstance(crtf_region, six.string_types):
+        if isinstance(crtf_region, str):
             region_list = regions.CRTFParser(crtf_region).shapes.to_regions()
         else:
             raise TypeError("{0} should be a CRTF string".format(crtf_region))

spectral_cube/stokes_spectral_cube.py

@@ -1,6 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
-import six
 import numpy as np
 
 from astropy.io.registry import UnifiedReadWriteMethod
@@ -113,10 +110,7 @@ def wcs(self):
         return self._wcs
 
     def __dir__(self):
-        if six.PY2:
-            return self.components + dir(type(self)) + list(self.__dict__)
-        else:
-            return self.components + super(StokesSpectralCube, self).__dir__()
+        return self.components + super(StokesSpectralCube, self).__dir__()
 
     @property
     def components(self):

spectral_cube/tests/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import os
 
 

spectral_cube/tests/helpers.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 from astropy import units as u
 
 from numpy.testing import assert_allclose as assert_allclose_numpy, assert_array_equal

spectral_cube/tests/setup_package.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 def get_package_data():
     return {
         _ASTROPY_PACKAGE_NAME_ + '.tests': ['coveragerc', 'data/*.fits', 'data/*.hdr', 'data/*.lmv', 'data/*reg']

spectral_cube/tests/test_casafuncs.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import os
 import shutil
 from itertools import product

spectral_cube/tests/test_io.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import numpy as np
 from astropy.io import fits as pyfits
 from astropy import units as u

spectral_cube/tests/test_masks.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import pytest
 import itertools
 import operator

spectral_cube/tests/test_moments.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import warnings
 from packaging.version import Version, parse
 

spectral_cube/tests/test_performance.py

@@ -4,8 +4,6 @@
 For now this is just for SpectralCube, not DaskSpectralCube.
 """
 
-from __future__ import print_function, absolute_import, division
-
 import numpy as np
 
 import pytest

spectral_cube/tests/test_projection.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import warnings
 import pytest
 import numpy as np

spectral_cube/tests/test_spectral_axis.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 from astropy import wcs
 from astropy.io import fits
 from astropy import units as u

spectral_cube/tests/test_spectral_cube.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import re
 import copy
 import operator

spectral_cube/tests/test_subcubes.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import pytest
 from packaging.version import Version, parse
 

spectral_cube/tests/test_visualization.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import pytest
 from packaging.version import Version, parse
 

spectral_cube/tests/test_wcs_utils.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import pytest
 import warnings
 

spectral_cube/tests/utilities.py

@@ -3,8 +3,6 @@
 Utilities for tests.
 '''
 
-from six.moves import zip
-
 import numpy as np
 import astropy.units as u
 from astropy.io import fits

spectral_cube/wcs_utils.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
 import numpy as np
 from astropy.wcs import WCS
 import warnings

spectral_cube/ytcube.py

@@ -1,6 +1,3 @@
-from __future__ import print_function, absolute_import, division
-
-import six
 import os
 import subprocess
 import numpy as np
@@ -214,7 +211,7 @@ def quick_isocontour(self, level='3 sigma', title='', description='',
         -------
         The result of the `yt.surface.export_sketchfab` function
         """
-        if isinstance(level, six.string_types):
+        if isinstance(level, str):
             sigma = self.cube.std().value
             level = float(level.split()[0]) * sigma