caom2utils 1.7.3__tar.gz → 1.7.4__tar.gz

{caom2utils-1.7.3/caom2utils.egg-info → caom2utils-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: caom2utils
-Version: 1.7.3
+Version: 1.7.4
 Summary: CAOM-2.4 utils
 Home-page: https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 Author: Canadian Astronomy Data Centre
@@ -10,10 +10,15 @@ 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.8, <4
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10, <3.15
 License-File: LICENSE
 Requires-Dist: cadcdata>=2.5.2
-Requires-Dist: caom2>=2.6
+Requires-Dist: caom2<3,>=2.6
 Requires-Dist: astropy>=2.0
 Requires-Dist: spherical-geometry>=1.2.11
 Requires-Dist: vos>=3.1.1

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/blueprints.py

@@ -982,9 +982,7 @@ class ObsBlueprint:
                             self._extensions[extension][caom2_element][1].insert(0, ttype_attribute)
                     else:
                         raise AttributeError(
-                            ('No TTYPE attributes in extension {} associated ' 'with keyword {}').format(
-                                extension, caom2_element
-                            )
+                            f'No TTYPE attributes in extension {extension} associated with keyword {caom2_element}'
                         )
                 else:
                     self._extensions[extension][caom2_element] = ('BINTABLE', [ttype_attribute], index)

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/caom2blueprint.py

@@ -467,7 +467,10 @@ def _load_module(module):
         raise e
 
 
-def caom2gen():
+def build_caom2gen_parser():
+    """
+    Build the ArgumentParser for caom2gen (without parsing argv).
+    """
     parser = get_gen_proc_arg_parser()
     parser.add_argument(
         '--blueprint',
@@ -479,6 +482,11 @@ def caom2gen():
             'per lineage entry.'
         ),
     )
+    return parser
+
+
+def caom2gen():
+    parser = build_caom2gen_parser()
 
     if len(sys.argv) < 2:
         parser.print_usage(file=sys.stderr)
@@ -528,10 +536,11 @@ def caom2gen():
     try:
         gen_proc(args, blueprints)
     except Exception as e:
+        from cadcutils.util.cli_errors import format_user_error
         logging.error('Failed caom2gen execution.')
-        logging.error(e)
-        tb = traceback.format_exc()
-        logging.error(tb)
+        logging.error(format_user_error(e))
+        if logging.getLogger().isEnabledFor(logging.DEBUG):
+            logging.debug(traceback.format_exc())
         sys.exit(-1)
 
     logging.debug(f'Done {APP_NAME} processing.')
@@ -711,7 +720,9 @@ def proc(args, obs_blueprints):
             raise RuntimeError(msg)
 
     subject = net.Subject.from_cmd_line_args(args)
-    client = data_util.StorageClientWrapper(subject, resource_id=args.resource_id)
+    client = data_util.StorageClientWrapper(
+        subject, resource_id=args.resource_id, host=args.host,
+        insecure=args.insecure)
     validate_wcs = True
     if args.no_validate:
         validate_wcs = False
@@ -831,13 +842,9 @@ def gen_proc(args, blueprints, **kwargs):
         connected = False
     else:
         subject = net.Subject.from_cmd_line_args(args)
-        if args.resource_id is None:
-            # if the resource_id is Undefined, using CadcDataClient
-            client = data_util.StorageClientWrapper(subject, using_storage_inventory=False)
-        else:
-            # if the resource_id is defined, assume that the caller intends to use the Storage Inventory system, as
-            # it's the CADC storage client that depends on a resource_id
-            client = data_util.StorageClientWrapper(subject, resource_id=args.resource_id)
+        client = data_util.StorageClientWrapper(
+            subject, resource_id=args.resource_id, host=args.host,
+            insecure=args.insecure)
 
     for ii, cardinality in enumerate(args.lineage):
         product_id, uri = _extract_ids(cardinality)

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/data_util.py

@@ -95,7 +95,8 @@ class StorageClientWrapper:
     Wrap the metrics collection with StorageInventoryClient.
     """
 
-    def __init__(self, subject, resource_id='ivo://cadc.nrc.ca/uvic/minoc', metrics=None):
+    def __init__(self, subject, resource_id='ivo://cadc.nrc.ca/uvic/minoc', metrics=None,
+                 host=None, insecure=False):
         """
         :param subject: net.Subject instance for authentication and authorization
         :param resource_id: str identifies the StorageInventoryClient endpoint. Defaults to the installation closest to
@@ -103,8 +104,11 @@ class StorageClientWrapper:
         :param metrics: caom2pipe.manaage_composable.Metrics instance. If set, will track execution times, by action,
             from the beginning of the method invocation to the end of the method invocation, success or failure.
             Defaults to None, because fits2caom2 is a stand-alone application.
+        :param host: Host server for the storage inventory service
+        :param insecure: skip SSL server certificate verification (for testing only)
         """
-        self._cadc_client = StorageInventoryClient(subject=subject, resource_id=resource_id)
+        self._cadc_client = StorageInventoryClient(
+            subject=subject, resource_id=resource_id, host=host, insecure=insecure)
         self._metrics = metrics
         self._logger = logging.getLogger(self.__class__.__name__)
 
@@ -274,15 +278,22 @@ def _clean_headers(fits_header):
 
 
 def get_local_headers_from_fits(fqn):
-    """Create a list of fits.Header instances from a fits file.
-    :param fqn str  fully-qualified name of the FITS file on disk
-    :return list of fits.Header instances
+    """Create a list of fits.Header instances from a FITS file or plain-text
+    header file.
+
+    When the file is not a FITS binary (e.g. a ``*.fits.header`` text file),
+    headers are parsed from text instead.
+
+    :param fqn: fully-qualified name of the file on disk
+    :return: list of fits.Header instances
     """
-    hdulist = fits.open(fqn, memmap=True, lazy_load_hdus=True)
-    hdulist.verify('fix')
-    hdulist.close()
-    headers = [h.header for h in hdulist]
-    return headers
+    try:
+        with fits.open(fqn, memmap=True, lazy_load_hdus=True) as hdulist:
+            hdulist.verify('fix')
+            return [h.header for h in hdulist]
+    except OSError:
+        with open(fqn, encoding='utf-8', errors='replace') as f:
+            return make_headers_from_string(f.read())
 
 
 def get_local_file_headers(fqn):

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/legacy.py

@@ -457,10 +457,12 @@ def update_blueprint(obs_blueprint, artifact_uri=None, config=None, defaults=Non
             return None
 
 
-def main_app():
+def build_fits2caom2_parser():
+    """
+    Build the ArgumentParser for fits2caom2 (without parsing argv).
+    """
     parser = caom2blueprint.get_arg_parser()
 
-    # add legacy fits2caom2 arguments
     parser.add_argument(
         '--config',
         required=False,
@@ -469,6 +471,11 @@ def main_app():
 
     parser.add_argument('--default', help='file with default values for keywords')
     parser.add_argument('--override', help='file with override values for keywords')
+    return parser
+
+
+def main_app():
+    parser = build_fits2caom2_parser()
 
     if len(sys.argv) < 2:
         # correct error message when running python3
@@ -507,9 +514,10 @@ def main_app():
     try:
         caom2blueprint.proc(args, obs_blueprint)
     except Exception as e:
-        logging.error(e)
-        tb = traceback.format_exc()
-        logging.debug(tb)
+        from cadcutils.util.cli_errors import format_user_error
+        logging.error(format_user_error(e))
+        if logging.getLogger().isEnabledFor(logging.DEBUG):
+            logging.debug(traceback.format_exc())
         sys.exit(-1)
 
     logging.info("DONE")

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/parsers.py

@@ -1899,7 +1899,8 @@ class Hdf5Parser(ContentParser):
         Retrieve metadata from file, cache in the blueprint.
         """
         self.logger.debug('Begin apply_blueprint_from_file')
-        # h5py is an extra in this package since most collections do not require it
+        # h5py is an extra in this package since most collections do not
+        # require it
         import h5py
 
         individual, multi, attributes, candidate_extensions = self._extract_path_names_from_blueprint()

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/tests/data/help.txt

@@ -1,4 +1,5 @@
-usage: fits2caom2 [-h] [--cert CERT | -n | --netrc-file NETRC_FILE | -u USER]
+usage: fits2caom2 [-h]
+                  [--cert CERT | -n | --netrc-file NETRC_FILE | -u USER | --token TOKEN]
                   [--resource-id RESOURCE_ID] [-q | -v] [-V] [--dumpconfig]
                   [--not_connected] [--no_validate] [-o OUT_OBS_XML]
                   (-i IN_OBS_XML | --observation collection observationID)
@@ -41,6 +42,7 @@ optional arguments:
   --resource-id RESOURCE_ID
                         resource identifier (default
                         ivo://cadc.nrc.ca/global/raven)
+  --token TOKEN         authentication token to use.
   -u, --user USER       name of user to authenticate. Note: application
                         prompts for the corresponding password!
   -v, --verbose         verbose messages

caom2utils-1.7.4/caom2utils/tests/test_cli_parsers.py

@@ -0,0 +1,146 @@
+# ***********************************************************************
+# ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
+# *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
+#
+#  (c) 2026.                            (c) 2026.
+#  Government of Canada                 Gouvernement du Canada
+#  National Research Council            Conseil national de recherches
+#  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
+#  All rights reserved                  Tous droits réservés
+#
+#  NRC disclaims any warranties,        Le CNRC dénie toute garantie
+#  expressed, implied, or               énoncée, implicite ou légale,
+#  statutory, of any kind with          de quelque nature que ce
+#  respect to the software,             soit, concernant le logiciel,
+#  including without limitation         y compris sans restriction
+#  any warranty of merchantability      toute garantie de valeur
+#  or fitness for a particular          marchande ou de pertinence
+#  purpose. NRC shall not be            pour un usage particulier.
+#  liable in any event for any          Le CNRC ne pourra en aucun cas
+#  damages, whether direct or           être tenu responsable de tout
+#  indirect, special or general,        dommage, direct ou indirect,
+#  consequential or incidental,         particulier ou général,
+#  arising from the use of the          accessoire ou fortuit, résultant
+#  software.  Neither the name          de l'utilisation du logiciel. Ni
+#  of the National Research             le nom du Conseil National de
+#  Council of Canada nor the            Recherches du Canada ni les noms
+#  names of its contributors may        de ses  participants ne peuvent
+#  be used to endorse or promote        être utilisés pour approuver ou
+#  products derived from this           promouvoir les produits dérivés
+#  software without specific prior      de ce logiciel sans autorisation
+#  written permission.                  préalable et particulière
+#                                       par écrit.
+#
+#  This file is part of the             Ce fichier fait partie du projet
+#  OpenCADC project.                    OpenCADC.
+#
+#  OpenCADC is free software:           OpenCADC est un logiciel libre ;
+#  you can redistribute it and/or       vous pouvez le redistribuer ou le
+#  modify it under the terms of         modifier suivant les termes de
+#  the GNU Affero General Public        la “GNU Affero General Public
+#  License as published by the          License” telle que publiée
+#  Free Software Foundation,            par la Free Software Foundation
+#  either version 3 of the              : soit la version 3 de cette
+#  License, or (at your option)         licence, soit (à votre gré)
+#  any later version.                   toute version ultérieure.
+#
+#  OpenCADC is distributed in the       OpenCADC est distribué
+#  hope that it will be useful,         dans l’espoir qu’il vous
+#  but WITHOUT ANY WARRANTY;            sera utile, mais SANS AUCUNE
+#  without even the implied             GARANTIE : sans même la garantie
+#  warranty of MERCHANTABILITY          implicite de COMMERCIALISABILITÉ
+#  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
+#  PURPOSE.  See the GNU Affero         PARTICULIER. Consultez la Licence
+#  General Public License for           Générale Publique GNU Affero pour
+#  more details.                        plus de détails.
+#
+#  You should have received             Vous devriez avoir reçu une
+#  a copy of the GNU Affero             copie de la Licence Générale
+#  General Public License along         Publique GNU Affero avec
+#  with OpenCADC.  If not, see          OpenCADC ; si ce n’est pas le cas,
+#  <http://www.gnu.org/licenses/>.      consultez :
+#                                       <http://www.gnu.org/licenses/>.
+#
+# ***********************************************************************
+
+"""Contract tests for fits2caom2 and caom2gen CLI parsers."""
+
+import os
+import sys
+from unittest.mock import patch
+
+import pytest
+
+from caom2utils import caom2blueprint
+from caom2utils.caom2blueprint import (
+    GLOBAL_STORAGE_RESOURCE_ID, build_caom2gen_parser, get_arg_parser,
+)
+from caom2utils.legacy import build_fits2caom2_parser
+from cadcutils.util.tests.parser_helpers import (
+    assert_has_base_dests, assert_has_dests, assert_help_contains,
+)
+
+THIS_DIR = os.path.dirname(os.path.realpath(__file__))
+TESTDATA_DIR = os.path.join(THIS_DIR, 'data')
+
+
+class MyExitError(Exception):
+    pass
+
+
+_COMMON_DESTS = (
+    'dumpconfig', 'not_connected', 'no_validate', 'out_obs_xml',
+    'in_obs_xml', 'observation', 'local',
+)
+
+
+def test_fits2caom2_base_parser_contract():
+    parser = get_arg_parser()
+    assert_has_base_dests(parser)
+    assert_has_dests(parser, *_COMMON_DESTS, 'productID', 'fileURI')
+    assert_help_contains(
+        parser,
+        GLOBAL_STORAGE_RESOURCE_ID,
+        'Augments an observation',
+    )
+
+
+def test_fits2caom2_legacy_parser_contract():
+    parser = build_fits2caom2_parser()
+    assert_has_base_dests(parser)
+    assert_has_dests(
+        parser, *_COMMON_DESTS, 'productID', 'fileURI',
+        'config', 'default', 'override',
+    )
+    assert_help_contains(parser, 'utype to keyword config')
+
+
+def test_caom2gen_parser_contract():
+    parser = build_caom2gen_parser()
+    assert_has_base_dests(parser)
+    assert_has_dests(
+        parser, *_COMMON_DESTS, 'external_url', 'module', 'plugin',
+        'lineage', 'use_blueprint_parser', 'blueprint',
+    )
+    assert_help_contains(
+        parser,
+        GLOBAL_STORAGE_RESOURCE_ID,
+        'productID/artifactURI',
+    )
+
+
+@patch('caom2utils.caom2blueprint.gen_proc', side_effect=RuntimeError('boom'))
+@patch('sys.exit', side_effect=MyExitError)
+def test_caom2gen_logs_debug_traceback_on_error(exit_mock, gen_mock):
+    blueprint = os.path.join(TESTDATA_DIR, 'si', 'si.blueprint')
+    sys.argv = (
+        'caom2gen --debug -o /tmp/out.xml --no_validate '
+        '--resource-id ivo://cadc.nrc.ca/test '
+        '--observation TEST_COLLECTION TEST_OBS_ID '
+        '--lineage test_product_id/cadc:TEST/test_file.fits '
+        '--blueprint {}'.format(blueprint)
+    ).split()
+    with pytest.raises(MyExitError):
+        caom2blueprint.caom2gen()
+    gen_mock.assert_called_once()
+    exit_mock.assert_called_once_with(-1)

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/tests/test_collections.py

@@ -350,5 +350,8 @@ def _read_observation(fname):
 
 
 def _write_observation(obs):
+    fd, path = tempfile.mkstemp(suffix='.xml', prefix='caom2utils_failed_obs_')
+    os.close(fd)
     writer = ObservationWriter(True, False, 'caom2', 'http://www.opencadc.org/caom2/xml/v2.4')
-    writer.write(obs, './x.xml')
+    writer.write(obs, path)
+    return path

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/tests/test_data_util.py

@@ -66,7 +66,6 @@
 # ***********************************************************************
 #
 
-from pathlib import Path
 
 from astropy.io import fits
 from cadcdata import FileInfo
@@ -104,7 +103,7 @@ def test_get_file_type():
 
 
 @patch('caom2utils.data_util.StorageInventoryClient')
-def test_storage_inventory_client(cadc_client_mock):
+def test_storage_inventory_client(cadc_client_mock, tmp_path):
     test_subject = Mock(autospec=True)
     test_uri = 'cadc:TEST/test_file.fits'
 
@@ -118,10 +117,11 @@ def test_storage_inventory_client(cadc_client_mock):
         else:
             test_fqn.write_text('StorageInventoryClient')
 
-    for test_working_directory in [Path(test_fits2caom2.TESTDATA_DIR), Path('./')]:
+    for subdir in (None, 'nested'):
+        test_working_directory = tmp_path / subdir if subdir else tmp_path
+        if subdir:
+            test_working_directory.mkdir()
         test_fqn = test_working_directory / 'test_file.fits'
-        if test_fqn.exists():
-            test_fqn.unlink()
 
         cadc_client_mock.return_value.cadcinfo.side_effect = info_si_mock
         cadc_client_mock.return_value.cadcget.side_effect = get_si_mock
@@ -227,6 +227,27 @@ def test_unicode_decode_error():
     assert result is not None, 'expect retry using a different method'
 
 
+def test_get_local_headers_from_text_header_file():
+    """Plain-text header files should be readable (issue #135)."""
+    test_fqn = join(
+        test_fits2caom2.TESTDATA_DIR,
+        'dao/dao_c122_2016_007830/dao_c122_2016_007830.fits.header',
+    )
+    result = data_util.get_local_headers_from_fits(test_fqn)
+    assert result is not None
+    assert len(result) == 1
+    assert result[0].get('OBJECT') == 'FLAT'
+
+
+def test_get_local_headers_from_multi_extension_text_header():
+    test_fqn = join(
+        test_fits2caom2.TESTDATA_DIR,
+        'gemini/N20250101M0624/N20250101M0624.fits.header',
+    )
+    result = data_util.get_local_headers_from_fits(test_fqn)
+    assert len(result) == 3
+
+
 def test_get_file_encoding():
     test_subjects = {'abc.fits': None, 'abc.fits.gz': 'gzip', 'abc.fits.fz': 'x-fits'}
     for test_subject in test_subjects.keys():

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils/tests/test_fits2caom2.py

@@ -93,6 +93,7 @@ from unittest.mock import Mock, patch
 from io import StringIO, BytesIO
 
 import importlib
+import logging
 import os
 import sys
 
@@ -536,52 +537,30 @@ def _get_from_str_xml(string_xml, get_func, element_tag):
     return act_obj
 
 
-@patch('sys.exit', Mock(side_effect=[MyExitError, MyExitError, MyExitError, MyExitError, MyExitError, MyExitError]))
-def test_help():
-    """Tests the helper displays for commands in main"""
+@patch('sys.exit', Mock(side_effect=[MyExitError, MyExitError, MyExitError, MyExitError]))
+def test_cli_errors():
+    """Tests CLI validation and error messages."""
 
-    # expected helper messages
     with open(os.path.join(TESTDATA_DIR, 'bad_product_id.txt')) as myfile:
         bad_product_id = myfile.read().strip()
     with open(os.path.join(TESTDATA_DIR, 'missing_product_id.txt')) as myfile:
         missing_product_id = myfile.read()
-    with open(os.path.join(TESTDATA_DIR, 'too_few_arguments_help.txt')) as myfile:
-        too_few_arguments_usage = myfile.read()
-    with open(os.path.join(TESTDATA_DIR, 'help.txt')) as myfile:
-        usage = myfile.read()
-    with open(os.path.join(TESTDATA_DIR, 'missing_observation_help.txt')) as myfile:
-        myfile.read()
-    with open(os.path.join(TESTDATA_DIR, 'missing_positional_argument_help.txt')) as myfile:
-        myfile.read()
-
-    # too few arguments error message when running python3
-    with patch('sys.stdout', new_callable=StringIO) as stdout_mock:
-        sys.argv = ["fits2caom2"]
-        with pytest.raises(MyExitError):
-            main_app()
-        if stdout_mock.getvalue():
-            assert too_few_arguments_usage == stdout_mock.getvalue()
 
-    # --help
-    with patch('sys.stdout', new_callable=StringIO) as stdout_mock:
-        sys.argv = ["fits2caom2", "-h"]
+    with patch('sys.stderr', new_callable=StringIO) as stderr_mock:
+        sys.argv = ["fits2caom2"]
         with pytest.raises(MyExitError):
             main_app()
-        expected = stdout_mock.getvalue().replace('options:', 'optional arguments:').strip('\n')
-        assert usage.strip('\n') == expected
+        assert 'too few arguments' in stderr_mock.getvalue()
 
-    # missing productID when plane count is wrong
     with patch('sys.stderr', new_callable=StringIO) as stderr_mock:
         with patch('sys.stdout', new_callable=StringIO) as stdout_mock:
             bad_product_file = os.path.join(TESTDATA_DIR, 'bad_product_id.xml')
             sys.argv = ["fits2caom2", "--in", bad_product_file, "ad:CGPS/CGPS_MA1_HI_line_image.fits"]
             with pytest.raises(MyExitError):
                 main_app()
-            # inconsistencies between Python 3.7 and later versions. this should be on stderr_mmock only
             result = stderr_mock.getvalue() + stdout_mock.getvalue()
             assert bad_product_id in result, result
 
-    # missing productID when blueprint doesn't have one either
     with patch('sys.stdout', new_callable=StringIO) as stdout_mock:
         with patch('sys.stderr', new_callable=StringIO) as stderr_mock, patch(
             'caom2utils.data_util.StorageClientWrapper'
@@ -597,27 +576,22 @@ def test_help():
             ]
             with pytest.raises(MyExitError):
                 main_app()
-            # inconsistencies between Python 3.7 and later versions. this should be on stderr_mmock only
             result = stderr_mock.getvalue() + stdout_mock.getvalue()
             assert missing_product_id.strip() in result, result
 
-    # missing required --observation
-    """
-    TODO: fix the tests
-    with patch('sys.stderr', new_callable=StringIO) as stdout_mock:
-        sys.argv = ["fits2caom2", "testProductID", "testpathto/testFileURI"]
-        with pytest.raises(MyExitError):
-            main_app()
-        assert(missing_observation_usage == stdout_mock.getvalue())
 
-    # missing positional argument
-    with patch('sys.stderr', new_callable=StringIO) as stdout_mock:
-        sys.argv = ["fits2caom2", "--observation", "testCollection",
-                    "testObservationID", "testPathTo/testFileURI"]
-        with pytest.raises(MyExitError):
-            main_app()
-        assert(missing_positional_argument_usage == stdout_mock.getvalue())
-    """
+@patch('caom2utils.caom2blueprint.proc', side_effect=RuntimeError('fail'))
+@patch('sys.exit', side_effect=MyExitError)
+def test_main_app_logs_debug_traceback_on_error(exit_mock, proc_mock):
+    logging.getLogger().setLevel(logging.DEBUG)
+    sys.argv = [
+        "fits2caom2", "--debug", "--observation", "cfht", "7000000o",
+        "ad:CGPS/CGPS_MA1_HI_line_image.fits",
+    ]
+    with pytest.raises(MyExitError):
+        main_app()
+    proc_mock.assert_called_once()
+    exit_mock.assert_called_once_with(-1)
 
 
 EXPECTED_OBS_XML = (
@@ -1073,7 +1047,7 @@ EXPECTED_GENERIC_PARSER_FILE_SCHEME_XML = (
           <caom2:productType>thumbnail</caom2:productType>
           <caom2:releaseType>data</caom2:releaseType>
           <caom2:contentType>text/plain</caom2:contentType>
-          <caom2:contentLength>2486</caom2:contentLength>
+          <caom2:contentLength>2573</caom2:contentLength>
           <caom2:contentChecksum>md5:e6c08f3b8309f05a5a3330e27e3b44eb</caom2:contentChecksum>
           <caom2:uri>file://"""
     + text_file

caom2utils-1.7.4/caom2utils/version.py

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

{caom2utils-1.7.3 → caom2utils-1.7.4/caom2utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: caom2utils
-Version: 1.7.3
+Version: 1.7.4
 Summary: CAOM-2.4 utils
 Home-page: https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 Author: Canadian Astronomy Data Centre
@@ -10,10 +10,15 @@ 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.8, <4
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10, <3.15
 License-File: LICENSE
 Requires-Dist: cadcdata>=2.5.2
-Requires-Dist: caom2>=2.6
+Requires-Dist: caom2<3,>=2.6
 Requires-Dist: astropy>=2.0
 Requires-Dist: spherical-geometry>=1.2.11
 Requires-Dist: vos>=3.1.1

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ caom2utils.egg-info/top_level.txt
 caom2utils/tests/__init__.py
 caom2utils/tests/conftest.py
 caom2utils/tests/test_caomvalidator.py
+caom2utils/tests/test_cli_parsers.py
 caom2utils/tests/test_collections.py
 caom2utils/tests/test_convert_from_java.py
 caom2utils/tests/test_custom_axis_util.py
@@ -44,13 +45,10 @@ caom2utils/tests/data/edge_case.blueprint
 caom2utils/tests/data/fits2caom2.config
 caom2utils/tests/data/help.txt
 caom2utils/tests/data/java.config
-caom2utils/tests/data/missing_observation_help.txt
-caom2utils/tests/data/missing_positional_argument_help.txt
 caom2utils/tests/data/missing_product_id.txt
 caom2utils/tests/data/nonconformant.py
 caom2utils/tests/data/test.override
 caom2utils/tests/data/test_plugin.py
 caom2utils/tests/data/test_plugin_class.py
 caom2utils/tests/data/text.override
-caom2utils/tests/data/time_axes.fits
-caom2utils/tests/data/too_few_arguments_help.txt
+caom2utils/tests/data/time_axes.fits

{caom2utils-1.7.3 → caom2utils-1.7.4}/caom2utils.egg-info/requires.txt

@@ -1,5 +1,5 @@
 cadcdata>=2.5.2
-caom2>=2.6
+caom2<3,>=2.6
 astropy>=2.0
 spherical-geometry>=1.2.11
 vos>=3.1.1

{caom2utils-1.7.3 → caom2utils-1.7.4}/setup.cfg

@@ -23,6 +23,9 @@ norecursedirs = build docs/_build
 doctest_plus = enabled
 testpaths = caom2utils
 
+[flake8]
+max-line-length = 120
+
 [metadata]
 package_name = caom2utils
 description = CAOM-2.4 utils
@@ -32,12 +35,12 @@ license = AGPLv3
 url = https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 edit_on_github = False
 github_project = opencadc/caom2tools
-version = 1.7.3
+version = 1.7.4
 
 [options]
 install_requires = 
 	cadcdata>=2.5.2
-	caom2>=2.6
+	caom2>=2.6,<3
 	astropy>=2.0
 	spherical-geometry>=1.2.11
 	vos>=3.1.1
@@ -51,9 +54,6 @@ test =
 	flake8>=3.9
 	xml-compare>=1.0.5
 
-[flake8]
-max-line-length = 120
-
 [entry_points]
 fits2caom2 = caom2utils.legacy:main_app
 caom2gen = caom2utils.caom2blueprint:caom2gen

{caom2utils-1.7.3 → caom2utils-1.7.4}/setup.py

@@ -106,7 +106,7 @@ setup(name=PACKAGENAME,
       use_2to3=False,
       setup_requires=['pytest-runner'],
       entry_points=entry_points,
-      python_requires='>=3.8, <4',
+      python_requires='>=3.10, <3.15',
       packages=find_packages(),
       package_data={PACKAGENAME: ['data/*', 'tests/data/*', '*/data/*', '*/tests/data/*']},
       classifiers=[
@@ -114,6 +114,11 @@ setup(name=PACKAGENAME,
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
       ],
       cmdclass={
           'coverage': PyTest,

caom2utils-1.7.3/caom2utils/tests/data/missing_observation_help.txt

@@ -1,8 +0,0 @@
-usage: fits2caom2 [-h] [-V] [-d | -q | -v] [--dumpconfig] [--ignorePartialWCS]
-                  [-o OUT_OBS_XML]
-                  (-i IN_OBS_XML | --observation collection observationID)
-                  [--config CONFIG] [--default DEFAULT] [--override OVERRIDE]
-                  [--local LOCAL [LOCAL ...]] [--log LOG] [--keep] [--test]
-                  [--cert CERT]
-                  productID fileURI [fileURI ...]
-fits2caom2: error: one of the arguments -i/--in --observation is required

caom2utils-1.7.3/caom2utils/tests/data/missing_positional_argument_help.txt

@@ -1,10 +0,0 @@
-usage: fits2caom2 [-h] [-V] [-d | -q | -v] [--dumpconfig] [--ignorePartialWCS]
-                  [-o OUT_OBS_XML]
-                  (-i IN_OBS_XML | --observation collection observationID)
-                  [--config CONFIG] [--default DEFAULT] [--override OVERRIDE]
-                  [--local LOCAL [LOCAL ...]] [--log LOG] [--keep] [--test]
-                  [--cert CERT]
-                  productID fileURI [fileURI ...]
-fits2caom2: error: too few arguments
-
-

caom2utils-1.7.3/caom2utils/version.py

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