caom2 2.5__tar.gz → 2.6.1__tar.gz

{caom2-2.5/caom2.egg-info → caom2-2.6.1}/PKG-INFO

@@ -1,20 +1,25 @@
 Metadata-Version: 2.1
 Name: caom2
-Version: 2.5
+Version: 2.6.1
 Summary: CAOM-2.4 library
 Home-page: http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 Author: Canadian Astronomy Data Centre
 Author-email: cadc@nrc-cnrc.gc.ca
 License: AGPLv3
-Platform: UNKNOWN
 Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4
-Provides-Extra: test
+Requires-Python: >=3.8, <4
 License-File: LICENSE
+Requires-Dist: aenum
+Requires-Dist: deprecated
+Requires-Dist: lxml>=3.7.0
+Provides-Extra: test
+Requires-Dist: pytest>=4.6; extra == "test"
+Requires-Dist: pytest-cov>=2.5.1; extra == "test"
+Requires-Dist: flake8>=3.4.1; extra == "test"
+Requires-Dist: funcsigs>=1.0.2; extra == "test"
 
 caom2
 =====
@@ -37,9 +42,6 @@ To create a minimal Simple Observation
 
 .. code:: python
 
-        # make it compatible with Python 2 and 3
-        from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
         import sys
         from caom2 import SimpleObservation, TypedOrderedDict, Plane, Artifact,\
                           Part, Chunk, ObservationWriter, ProductType,\
@@ -418,5 +420,3 @@ The output:
 		</caom2:plane>
 	  </caom2:planes>
 	</caom2:Observation>
-
-

{caom2-2.5 → caom2-2.6.1}/README.rst

@@ -19,9 +19,6 @@ To create a minimal Simple Observation
 
 .. code:: python
 
-        # make it compatible with Python 2 and 3
-        from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
         import sys
         from caom2 import SimpleObservation, TypedOrderedDict, Plane, Artifact,\
                           Part, Chunk, ObservationWriter, ProductType,\

{caom2-2.5 → caom2-2.6.1}/caom2/artifact.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -71,12 +70,8 @@
 
 """
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
-
 from builtins import str, int
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 from . import caom_util
 from .chunk import ProductType

{caom2-2.5 → caom2-2.6.1}/caom2/caom_util.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
@@ -76,16 +75,11 @@ the first point of use could be implemented.  This helps the data
 engineer get the correct meta data more quickly.
 """
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import sys
 import collections
 from datetime import datetime
 
-import six
-from six.moves import collections_abc
-from six.moves.urllib.parse import urlsplit
+from urllib.parse import urlsplit
 from builtins import int, str as newstr
 
 
@@ -267,7 +261,7 @@ class TypedList(collections.abc.MutableSequence):
         return self._oktypes
 
 
-class TypedSet(collections_abc.MutableSet):
+class TypedSet(collections.abc.MutableSet):
     """
     Class that implements a typed set in Python. Supported types
     are specified when instance is created. Example:
@@ -402,12 +396,12 @@ class TypedOrderedDict(collections.OrderedDict):
 
     def __str__(self):
         return "\n".join(["{} => {}".format(k, v)
-                          for k, v in six.iteritems(self)])
+                          for k, v in self.items()])
 
     def __repr__(self):
         return "TypedOrderedDict((%r))," % self._oktypes + (
             "(".join(
-                ["(%r,%r)" % (k, v) for k, v in six.iteritems(self)]) + ")")
+                ["(%r,%r)" % (k, v) for k, v in self.items()]) + ")")
 
     def check(self, key, value):
         """

{caom2-2.5 → caom2-2.6.1}/caom2/checksum.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2017.                            (c) 2017.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -66,8 +65,6 @@
 #
 # ***********************************************************************
 #
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
 
 import hashlib
 import logging

{caom2-2.5 → caom2-2.6.1}/caom2/chunk.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2019.                            (c) 2019.
+#  (c) 2024.                            (c) 2024.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -71,8 +70,6 @@
 
 """
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
 
 from builtins import str
 
@@ -85,34 +82,59 @@ from .common import CaomObject, OrderedEnum
 
 class ProductType(OrderedEnum):
     """
-    SCIENCE: "science"
-    CALIBRATION: "calibration"
-    PREVIEW: "preview"
-    INFO: "info"
-    NOISE: "noise"
-    WEIGHT: "weight"
-    AUXILIARY: "auxiliary"
-    THUMBNAIL: "thumbnail"
-    BIAS: "bias"
-    DARK: "dark"
-    FLAT: "flat"
-    WAVECAL: "wavecal"
+    Subset of IVOA DataLink terms at:
+        https://www.ivoa.net/rdf/datalink/core/2022-01-27/datalink.html
+
+    THIS = "this"
+    AUXILIARY = "auxiliary"
+    BIAS = 'bias'
+    CALIBRATION = 'calibration'
+    CODERIVED = 'coderived'
+    DARK = 'dark'
+    DOCUMENTATION = 'documentation'
+    ERROR = 'error'
+    FLAT = 'flat'
+    NOISE = 'noise'
+    PREVIEW = 'preview'
+    PREVIEW_IMAGE = 'preview-image'
+    PREVIEW_PLOT = 'preview-plot'
+    THUMBNAIL = 'thumbnail'
+    WEIGHT = 'weight'
+
     """
-    # __order__ required for Python2.7
-    __order__ = "SCIENCE CALIBRATION PREVIEW INFO NOISE WEIGHT AUXILIARY " \
-                "THUMBNAIL BIAS DARK FLAT WAVECAL"
-    SCIENCE = "science"
-    CALIBRATION = "calibration"
-    PREVIEW = "preview"
-    INFO = "info"
-    NOISE = "noise"
-    WEIGHT = "weight"
+
+    THIS = "this"
+
     AUXILIARY = "auxiliary"
-    THUMBNAIL = "thumbnail"
-    BIAS = "bias"
-    DARK = "dark"
-    FLAT = "flat"
-    WAVECAL = "wavecal"
+    BIAS = 'bias'
+    CALIBRATION = 'calibration'
+    CODERIVED = 'coderived'
+    DARK = 'dark'
+    DOCUMENTATION = 'documentation'
+    ERROR = 'error'
+    FLAT = 'flat'
+    NOISE = 'noise'
+    PREVIEW = 'preview'
+    PREVIEW_IMAGE = 'preview-image'
+    PREVIEW_PLOT = 'preview-plot'
+    THUMBNAIL = 'thumbnail'
+    WEIGHT = 'weight'
+
+    # DataLink terms explicitly not included
+    # counterpart
+    # cutout
+    # derivation
+    # detached - header
+    # package
+    # proc
+    # progenitor
+
+    # CAOM specific terms public
+    SCIENCE = 'science'  # this
+
+    # deprecated
+    # INFO = 'info'
+    # CATALOG = 'catalog'
 
 
 __all__ = ['ProductType', 'Chunk', 'ObservableAxis', 'SpatialWCS',

{caom2-2.5 → caom2-2.6.1}/caom2/common.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -67,17 +66,13 @@
 # ***********************************************************************
 #
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import inspect
 import uuid
 from datetime import datetime
 
 from builtins import int, str
-from six.moves.urllib.parse import SplitResult, urlparse, urlsplit
+from urllib.parse import SplitResult, urlparse, urlsplit
 import logging
-import six
 
 from . import caom_util
 import warnings
@@ -110,7 +105,7 @@ class OrderedEnum(Enum):
     """
     Enums are in the order of their definition.
 
-    This is here just for Python2.7 and to work with aenum.
+    TODO: not sure this is required in Python 3
     enum.Enum is supposed to support this.
     """
 
@@ -148,10 +143,7 @@ class CaomObject(object):
         pass
 
     def __str__(self):
-        if six.PY3:
-            args = inspect.getfullargspec(self.__init__).args[1:]
-        else:
-            args = inspect.getargspec(self.__init__).args[1:]
+        args = inspect.getfullargspec(self.__init__).args[1:]
         class_name = self.__class__.__name__
         return "\n".join(["{}.{} : {}".
                          format(class_name, arg, getattr(self, arg, None))
@@ -164,10 +156,7 @@ class CaomObject(object):
             return False
 
     def __repr__(self):
-        if six.PY3:
-            args = inspect.getfullargspec(self.__init__).args[1:]
-        else:
-            args = inspect.getargspec(self.__init__).args[1:]
+        args = inspect.getfullargspec(self.__init__).args[1:]
         class_name = ""
         if self.__class__.__module__ != '__main__':
             class_name += self.__class__.__module__ + "."

{caom2-2.5 → caom2-2.6.1}/caom2/diff.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2018.                            (c) 2018.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -72,9 +71,6 @@ A difference method for CAOM2 entities.
 
 """
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import math
 
 from caom2.common import CaomObject
@@ -413,7 +409,7 @@ def _not_equal(rhs, lhs):
         else:
             # if only using python 3.5+, use math.isclose, instead of this
             # description of math.isclose from the python documentation
-            result = abs(rhs-lhs) <= max(1e-10 * max(abs(rhs), abs(lhs)), 1e-9)
+            result = abs(rhs-lhs) <= max(1e-12 * max(abs(rhs), abs(lhs)), 1e-11)
     else:
         result = rhs == lhs
     return not result

{caom2-2.5 → caom2-2.6.1}/caom2/obs_reader_writer.py

@@ -3,7 +3,7 @@
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -70,14 +70,10 @@
 
 """ Defines ObservationReader class """
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import os
 import uuid
 from builtins import str, int
-import six
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 from lxml import etree
 
@@ -2039,7 +2035,7 @@ class ObservationWriter(object):
             return
 
         element = self._get_caom_element("planes", parent)
-        for _plane in six.itervalues(planes):
+        for _plane in planes.values():
             plane_element = self._get_caom_element("plane", element)
             self._add_entity_attributes(_plane, plane_element)
             self._add_element("productID", _plane.product_id, plane_element)
@@ -2297,7 +2293,7 @@ class ObservationWriter(object):
             return
 
         element = self._get_caom_element("artifacts", parent)
-        for _artifact in six.itervalues(artifacts):
+        for _artifact in artifacts.values():
             artifact_element = self._get_caom_element("artifact", element)
             self._add_entity_attributes(_artifact, artifact_element)
             self._add_element("uri", _artifact.uri, artifact_element)
@@ -2335,7 +2331,7 @@ class ObservationWriter(object):
             return
 
         element = self._get_caom_element("parts", parent)
-        for _part in six.itervalues(parts):
+        for _part in parts.values():
             part_element = self._get_caom_element("part", element)
             self._add_entity_attributes(_part, part_element)
             self._add_element("name", _part.name, part_element)
@@ -2680,8 +2676,6 @@ class ObservationWriter(object):
             element.text = value
         else:
             if isinstance(value, float):
-                # in Python 2.7 str(float) might alter precision of float
-                # therefore call repr instead
                 element.text = repr(value)
             else:
                 element.text = str(value)

{caom2-2.5 → caom2-2.6.1}/caom2/observation.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -69,12 +68,8 @@
 
 """definition of the  caom2.Observation object."""
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 from datetime import datetime
 
-import six
 from builtins import str
 import warnings
 from deprecated import deprecated
@@ -86,7 +81,7 @@ from .common import AbstractCaomEntity, CaomObject, ObservationURI, \
 from .common import _CAOM_VOCAB_NS
 from .plane import Plane
 from .shape import Point
-from six.moves.urllib.parse import urlsplit
+from urllib.parse import urlsplit
 with warnings.catch_warnings():
     warnings.simplefilter('ignore')
     from aenum import Enum
@@ -103,8 +98,6 @@ class ObservationIntentType(OrderedEnum):
     CALIBRATION: "calibration"
     SCIENCE: "science"
     """
-    # __order__ required for Python2.7
-    __order__ = "SCIENCE CALIBRATION"
     SCIENCE = "science"
     CALIBRATION = "calibration"
 
@@ -506,7 +499,7 @@ class Algorithm(CaomObject):
                simple observation, otherwise name of algorithm that selected
                composite members or just 'composite' works too.
         """
-        caom_util.type_check(name, six.text_type, 'name', override=False)
+        caom_util.type_check(name, str, 'name', override=False)
         self._name = str(name)
 
     def _key(self):

{caom2-2.5 → caom2-2.6.1}/caom2/part.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -70,9 +69,6 @@
 """Defines the caom2.Part class which describes
 the caom2_Observation_Plane_Artifact_Part object."""
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 from builtins import str
 
 from . import caom_util

{caom2-2.5 → caom2-2.6.1}/caom2/plane.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -69,13 +68,10 @@
 
 """defines the caom2.Plane class"""
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 from datetime import datetime
 
 from builtins import str, int
-from six.moves.urllib.parse import SplitResult, urlsplit
+from urllib.parse import SplitResult, urlsplit
 from deprecated import deprecated
 
 from caom2.caom_util import int_32
@@ -87,6 +83,7 @@ from .common import AbstractCaomEntity, CaomObject, ObservationURI,\
     VocabularyTerm, OrderedEnum
 from .common import _CAOM_VOCAB_NS, _OBSCORE_VOCAB_NS
 import warnings
+from enum import Enum
 with warnings.catch_warnings():
     warnings.simplefilter('ignore')
     from aenum import Enum, extend_enum
@@ -153,8 +150,6 @@ class EnergyBand(OrderedEnum):
     XRAY: "X-ray"
     GAMMARAY: "Gamma-ray"
     """
-    # __order__ required for Python2.7
-    __order__ = "RADIO MILLIMETER INFRARED OPTICAL UV EUV XRAY GAMMARAY"
     RADIO = "Radio"
     MILLIMETER = "Millimeter"
     INFRARED = "Infrared"
@@ -186,9 +181,6 @@ class PolarizationState(OrderedEnum):
     XY: "XY"
     YX: "YX"
     """
-    # __order__ required for Python2.7
-    __order__ = "I Q U V RR LL RL LR XX YY XY YX POLI FPOLI POLA EPOLI " \
-                "CPOLI NPOLI"
     I = "I"  # noqa
     Q = "Q"
     U = "U"

{caom2-2.5 → caom2-2.6.1}/caom2/shape.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -67,9 +66,6 @@
 # ***********************************************************************
 #
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import math
 from caom2.caom_util import int_32
 from . import caom_util

{caom2-2.5 → caom2-2.6.1}/caom2/tests/caom_test_instances.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -69,13 +68,9 @@
 
 """ Defines Caom2TestInstances class """
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import collections
 from datetime import datetime
 import uuid
-import six
 from builtins import int
 
 from caom2 import artifact
@@ -361,7 +356,7 @@ class Caom2TestInstances(object):
                     _plane.data_read_groups.add('ivo://cadc.nrc.ca/groups?C')
 
             if self.depth > 2:
-                for k, v in six.iteritems(self.get_artifacts()):
+                for k, v in self.get_artifacts().items():
                     _plane.artifacts[k] = v
             planes[prod_id] = _plane
         return planes
@@ -522,7 +517,7 @@ class Caom2TestInstances(object):
                 _artifact.acc_meta_checksum = common.ChecksumURI(
                     "md5:844ce247db0844ad9f721430c80e7a21")
         if self.depth > 3:
-            for k, v in six.iteritems(self.get_parts()):
+            for k, v in self.get_parts().items():
                 _artifact.parts[k] = v
         artifacts["ad:foo/bar1"] = _artifact
         if self.caom_version >= 24:

{caom2-2.5 → caom2-2.6.1}/caom2/tests/data/diff-expected-CAOM-2.3.xml

@@ -119,11 +119,11 @@
       <caom2:time>
         <caom2:bounds>
           <caom2:lower>58979.5015625</caom2:lower>
-          <caom2:upper>58979.5017365</caom2:upper>
+          <caom2:upper>58979.50173611111</caom2:upper>
           <caom2:samples>
             <caom2:sample>
               <caom2:lower>58979.5015625</caom2:lower>
-              <caom2:upper>58979.5017365</caom2:upper>
+              <caom2:upper>58979.50173611111</caom2:upper>
             </caom2:sample>
           </caom2:samples>
         </caom2:bounds>

{caom2-2.5 → caom2-2.6.1}/caom2/tests/test_artifact.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -69,12 +68,9 @@
 
 """ Defines TestArtifact class """
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import unittest
 
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 from .. import artifact
 from .. import common

{caom2-2.5 → caom2-2.6.1}/caom2/tests/test_caom_util.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # ***********************************************************************
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2016.                            (c) 2016.
+#  (c) 2022.                            (c) 2022.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -67,9 +66,6 @@
 # ***********************************************************************
 #
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import unittest
 import pytest