From 2781499751942e7c985f24b982170cbdabe56333 Mon Sep 17 00:00:00 2001 From: Sharon Goliath Date: Wed, 31 Jul 2024 11:51:32 -0700 Subject: [PATCH 1/3] CADC-13609 - there is no CustomWCS axis setter. --- caom2utils/caom2utils/wcs_parsers.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/caom2utils/caom2utils/wcs_parsers.py b/caom2utils/caom2utils/wcs_parsers.py index 33d956d3..ed02fa26 100644 --- a/caom2utils/caom2utils/wcs_parsers.py +++ b/caom2utils/caom2utils/wcs_parsers.py @@ -317,10 +317,7 @@ def augment_custom(self, chunk): ref_coord = self._get_ref_coord(custom_axis_index) if delta and ref_coord: naxis.function = CoordFunction1D(custom_axis_length, delta, ref_coord) - if not chunk.custom: - chunk.custom = CustomWCS(naxis) - else: - chunk.custom.axis = naxis + chunk.custom = CustomWCS(naxis) self.logger.debug('End Custom WCS augmentation.') From 69991a1a352acda0d3e5d5347788b85f87a84bc6 Mon Sep 17 00:00:00 2001 From: Sharon Goliath Date: Wed, 31 Jul 2024 12:04:59 -0700 Subject: [PATCH 2/3] CADC-13609 - increase version number. --- caom2utils/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caom2utils/setup.cfg b/caom2utils/setup.cfg index fc6813bb..a18ac79a 100644 --- a/caom2utils/setup.cfg +++ b/caom2utils/setup.cfg @@ -33,7 +33,7 @@ url = https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2 edit_on_github = False github_project = opencadc/caom2tools # version should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386) -version = 1.7.2 +version = 1.7.3 [options] install_requires = From d0a7523c245dfcc30fbf3fc08d1a93c46b736113 Mon Sep 17 00:00:00 2001 From: Sharon Goliath Date: Wed, 31 Jul 2024 13:28:51 -0700 Subject: [PATCH 3/3] CADC-13609/CADC-12944 - numpy 2+ compatibility. --- caom2/caom2/obs_reader_writer.py | 5 +---- caom2/setup.cfg | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/caom2/caom2/obs_reader_writer.py b/caom2/caom2/obs_reader_writer.py index 87ddb227..ffb38aaa 100644 --- a/caom2/caom2/obs_reader_writer.py +++ b/caom2/caom2/obs_reader_writer.py @@ -2675,10 +2675,7 @@ def _add_element(self, name, value, parent): 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: diff --git a/caom2/setup.cfg b/caom2/setup.cfg index b9911882..0d349833 100644 --- a/caom2/setup.cfg +++ b/caom2/setup.cfg @@ -36,7 +36,7 @@ url = http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2 edit_on_github = False github_project = opencadc/caom2tools # version should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386) -version = 2.6.1 +version = 2.6.2 [options] install_requires =