CADC-13609 - there is no CustomWCS axis setter. (#183)

* CADC-13609/CADC-12944 - numpy 2+ compatibility.
opencadc · Jul 31, 2024 · b700763 · b700763
1 parent 0df74be
commit b700763
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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 =

diff --git 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.')
 

diff --git 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 =