caom2 2.6__tar.gz → 2.6.2__tar.gz

{caom2-2.6/caom2.egg-info → caom2-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caom2
-Version: 2.6
+Version: 2.6.2
 Summary: CAOM-2.4 library
 Home-page: http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 Author: Canadian Astronomy Data Centre
@@ -10,9 +10,16 @@ Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.7, <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
 =====

{caom2-2.6 → caom2-2.6.2}/caom2/chunk.py

@@ -2,7 +2,7 @@
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2022.                            (c) 2022.
+#  (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
@@ -82,31 +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'
+
     """
-    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.6 → caom2-2.6.2}/caom2/obs_reader_writer.py

@@ -2675,10 +2675,7 @@ class ObservationWriter(object):
         if isinstance(value, str):
             element.text = value
         else:
-            if isinstance(value, float):
-                element.text = repr(value)
-            else:
-                element.text = str(value)
+            element.text = str(value)
 
     def _add_boolean_element(self, name, value, parent):
         if value is None:

{caom2-2.6 → caom2-2.6.2}/caom2/tests/test_checksum.py

@@ -2,7 +2,7 @@
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2022.                            (c) 2022.
+#  (c) 2023.                            (c) 2023.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -81,7 +81,7 @@ from caom2 import update_meta_checksum
 from caom2.caom_util import str2ivoa
 from caom2.checksum import update_checksum, int_32, checksum_diff
 import tempfile
-from mock import patch
+from unittest.mock import patch
 from io import StringIO
 
 THIS_DIR = os.path.dirname(os.path.realpath(__file__))

{caom2-2.6 → caom2-2.6.2}/caom2/tests/test_chunk.py

@@ -2,7 +2,7 @@
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2022.                            (c) 2022.
+#  (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
@@ -92,10 +92,10 @@ class TestEnums(unittest.TestCase):
         self.assertEqual(chunk.ProductType[
                              chunk.ProductType.SCIENCE.name].value, "science")
 
+        self.assertEqual(chunk.ProductType.THIS.value, "this")
         self.assertEqual(chunk.ProductType.SCIENCE.value, "science")
         self.assertEqual(chunk.ProductType.CALIBRATION.value, "calibration")
         self.assertEqual(chunk.ProductType.PREVIEW.value, "preview")
-        self.assertEqual(chunk.ProductType.INFO.value, "info")
         self.assertEqual(chunk.ProductType.NOISE.value, "noise")
         self.assertEqual(chunk.ProductType.WEIGHT.value, "weight")
         self.assertEqual(chunk.ProductType.AUXILIARY.value, "auxiliary")
@@ -103,7 +103,10 @@ class TestEnums(unittest.TestCase):
         self.assertEqual(chunk.ProductType.BIAS.value, "bias")
         self.assertEqual(chunk.ProductType.DARK.value, "dark")
         self.assertEqual(chunk.ProductType.FLAT.value, "flat")
-        self.assertEqual(chunk.ProductType.WAVECAL.value, "wavecal")
+        self.assertEqual(chunk.ProductType.CODERIVED.value, "coderived")
+        self.assertEqual(chunk.ProductType.DOCUMENTATION.value, "documentation")
+        self.assertEqual(chunk.ProductType.PREVIEW_IMAGE.value, "preview-image")
+        self.assertEqual(chunk.ProductType.PREVIEW_PLOT.value, "preview-plot")
 
 
 class TestChunk(unittest.TestCase):

caom2-2.6.2/caom2/version.py

@@ -0,0 +1 @@
+version = '2.6.2'

{caom2-2.6 → caom2-2.6.2/caom2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caom2
-Version: 2.6
+Version: 2.6.2
 Summary: CAOM-2.4 library
 Home-page: http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 Author: Canadian Astronomy Data Centre
@@ -10,9 +10,16 @@ Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.7, <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
 =====

{caom2-2.6 → caom2-2.6.2}/caom2.egg-info/requires.txt

@@ -7,4 +7,3 @@ pytest>=4.6
 pytest-cov>=2.5.1
 flake8>=3.4.1
 funcsigs>=1.0.2
-mock>=2.0.0

{caom2-2.6 → caom2-2.6.2}/setup.cfg

@@ -35,7 +35,7 @@ license = AGPLv3
 url = http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 edit_on_github = False
 github_project = opencadc/caom2tools
-version = 2.6
+version = 2.6.2
 
 [options]
 install_requires = 
@@ -49,7 +49,6 @@ test =
 	pytest-cov>=2.5.1
 	flake8>=3.4.1
 	funcsigs>=1.0.2
-	mock>=2.0.0
 
 [entry_points]
 caom2-checksum = caom2.checksum:checksum_diff

{caom2-2.6 → caom2-2.6.2}/setup.py

@@ -4,16 +4,11 @@
 import glob
 import os
 import sys
-import imp
 from setuptools.command.test import test as TestCommand
 from setuptools import find_packages
 
 from setuptools import setup
 
-import distutils.cmd
-import distutils.log
-import subprocess
-
 # read the README.rst file and return as string.
 def readme():
     with open('README.rst') as r_obj:
@@ -41,7 +36,7 @@ VERSION = metadata.get('version', 'none')
 
 # generate the version file
 with open(os.path.join(PACKAGENAME, 'version.py'), 'w') as f:
-    f.write('version = \'{}\'\n'.format(VERSION))	
+    f.write('version = \'{}\'\n'.format(VERSION))
 
 # Treat everything in scripts except README.rst as a script to be installed
 scripts = [fname for fname in glob.glob(os.path.join('scripts', '*'))
@@ -71,7 +66,7 @@ class PyTest(TestCommand):
         import pytest
         err_no = pytest.main(self.pytest_args)
         sys.exit(err_no)
-        
+
 # Note that requires and provides should not be included in the call to
 # ``setup``, since these are now deprecated. See this link for more details:
 # https://groups.google.com/forum/#!topic/astropy-dev/urYO8ckB2uM
@@ -90,7 +85,7 @@ setup(name=PACKAGENAME,
       use_2to3=False,
       setup_requires=['pytest-runner'],
       entry_points=entry_points,
-      python_requires='>=3.7, <4',
+      python_requires='>=3.8, <4',
       packages=find_packages(),
       package_data={PACKAGENAME: ['data/*', 'tests/data/*', '*/data/*', '*/tests/data/*']},
       classifiers=[

caom2-2.6/caom2/version.py

@@ -1 +0,0 @@
-version = '2.6'