Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jul 31, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2781499
CADC-13609 - there is no CustomWCS axis setter.
SharonGoliath Jul 31, 2024
69991a1
CADC-13609 - increase version number.
SharonGoliath Jul 31, 2024
d0a7523
CADC-13609/CADC-12944 - numpy 2+ compatibility.
SharonGoliath Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions caom2/caom2/obs_reader_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion caom2/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
5 changes: 1 addition & 4 deletions caom2utils/caom2utils/wcs_parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.')

Expand Down
2 changes: 1 addition & 1 deletion caom2utils/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down