caom2 2.6.3__tar.gz → 2.6.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (76) hide show
  1. {caom2-2.6.3/caom2.egg-info → caom2-2.6.4}/PKG-INFO +1 -1
  2. {caom2-2.6.3 → caom2-2.6.4}/caom2/obs_reader_writer.py +2 -2
  3. {caom2-2.6.3 → caom2-2.6.4}/caom2/plane.py +2 -10
  4. caom2-2.6.4/caom2/version.py +1 -0
  5. {caom2-2.6.3 → caom2-2.6.4/caom2.egg-info}/PKG-INFO +1 -1
  6. {caom2-2.6.3 → caom2-2.6.4}/setup.cfg +1 -1
  7. caom2-2.6.3/caom2/version.py +0 -1
  8. {caom2-2.6.3 → caom2-2.6.4}/LICENSE +0 -0
  9. {caom2-2.6.3 → caom2-2.6.4}/MANIFEST.in +0 -0
  10. {caom2-2.6.3 → caom2-2.6.4}/README.rst +0 -0
  11. {caom2-2.6.3 → caom2-2.6.4}/caom2/__init__.py +0 -0
  12. {caom2-2.6.3 → caom2-2.6.4}/caom2/artifact.py +0 -0
  13. {caom2-2.6.3 → caom2-2.6.4}/caom2/caom_util.py +0 -0
  14. {caom2-2.6.3 → caom2-2.6.4}/caom2/checksum.py +0 -0
  15. {caom2-2.6.3 → caom2-2.6.4}/caom2/chunk.py +0 -0
  16. {caom2-2.6.3 → caom2-2.6.4}/caom2/common.py +0 -0
  17. {caom2-2.6.3 → caom2-2.6.4}/caom2/data/CAOM-2.2.xsd +0 -0
  18. {caom2-2.6.3 → caom2-2.6.4}/caom2/data/CAOM-2.3.xsd +0 -0
  19. {caom2-2.6.3 → caom2-2.6.4}/caom2/data/CAOM-2.4.xsd +0 -0
  20. {caom2-2.6.3 → caom2-2.6.4}/caom2/diff.py +0 -0
  21. {caom2-2.6.3 → caom2-2.6.4}/caom2/observation.py +0 -0
  22. {caom2-2.6.3 → caom2-2.6.4}/caom2/part.py +0 -0
  23. {caom2-2.6.3 → caom2-2.6.4}/caom2/shape.py +0 -0
  24. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/__init__.py +0 -0
  25. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/caom_test_instances.py +0 -0
  26. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteCompositeCircle-CAOM-2.2.xml +0 -0
  27. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteCompositeCircle-CAOM-2.3.xml +0 -0
  28. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteCompositePolygon-CAOM-2.2.xml +0 -0
  29. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteCompositePolygon-CAOM-2.3.xml +0 -0
  30. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteSimpleCircle-CAOM-2.2.xml +0 -0
  31. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteSimpleCircle-CAOM-2.3.xml +0 -0
  32. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteSimplePolygon-CAOM-2.2.xml +0 -0
  33. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/CompleteSimplePolygon-CAOM-2.3.xml +0 -0
  34. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalCompositeCircle-CAOM-2.2.xml +0 -0
  35. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalCompositeCircle-CAOM-2.3.xml +0 -0
  36. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalCompositePolygon-CAOM-2.2.xml +0 -0
  37. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalCompositePolygon-CAOM-2.3.xml +0 -0
  38. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalSimpleCircle-CAOM-2.2.xml +0 -0
  39. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalSimpleCircle-CAOM-2.3.xml +0 -0
  40. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalSimplePolygon-CAOM-2.2.xml +0 -0
  41. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/MinimalSimplePolygon-CAOM-2.3.xml +0 -0
  42. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/SampleComposite-CAOM-2.3.xml +0 -0
  43. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/SampleDerived-CAOM-2.4.xml +0 -0
  44. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/SampleSimple-CAOM-2.3.xml +0 -0
  45. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/diff-actual-CAOM-2.3.xml +0 -0
  46. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/diff-actual-CAOM-2.4.xml +0 -0
  47. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/diff-expected-CAOM-2.3.xml +0 -0
  48. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/data/diff-expected-CAOM-2.4.xml +0 -0
  49. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_artifact.py +0 -0
  50. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_caom_util.py +0 -0
  51. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_checksum.py +0 -0
  52. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_chunk.py +0 -0
  53. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_common.py +0 -0
  54. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_diffs.py +0 -0
  55. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_obs_reader_writer.py +0 -0
  56. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_observation.py +0 -0
  57. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_part.py +0 -0
  58. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_plane.py +0 -0
  59. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_shape.py +0 -0
  60. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_wcs.py +0 -0
  61. {caom2-2.6.3 → caom2-2.6.4}/caom2/tests/xml_compare.py +0 -0
  62. {caom2-2.6.3 → caom2-2.6.4}/caom2/wcs.py +0 -0
  63. {caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/SOURCES.txt +0 -0
  64. {caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/dependency_links.txt +0 -0
  65. {caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/entry_points.txt +0 -0
  66. {caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/not-zip-safe +0 -0
  67. {caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/requires.txt +0 -0
  68. {caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/top_level.txt +0 -0
  69. {caom2-2.6.3 → caom2-2.6.4}/docs/Makefile +0 -0
  70. {caom2-2.6.3 → caom2-2.6.4}/docs/_templates/autosummary/base.rst +0 -0
  71. {caom2-2.6.3 → caom2-2.6.4}/docs/_templates/autosummary/class.rst +0 -0
  72. {caom2-2.6.3 → caom2-2.6.4}/docs/_templates/autosummary/module.rst +0 -0
  73. {caom2-2.6.3 → caom2-2.6.4}/docs/conf.py +0 -0
  74. {caom2-2.6.3 → caom2-2.6.4}/docs/index.rst +0 -0
  75. {caom2-2.6.3 → caom2-2.6.4}/docs/make.bat +0 -0
  76. {caom2-2.6.3 → caom2-2.6.4}/setup.py +0 -0
{caom2-2.6.3/caom2.egg-info → caom2-2.6.4}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: caom2
3
- Version: 2.6.3
3
+ Version: 2.6.4
4
4
  Summary: CAOM-2.4 library
5
5
  Home-page: http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
6
6
  Author: Canadian Astronomy Data Centre
{caom2-2.6.3 → caom2-2.6.4}/caom2/obs_reader_writer.py RENAMED
@@ -645,7 +645,7 @@ class ObservationReader(object):
645
645
  return None
646
646
  else:
647
647
  ucd = self._get_child_text("ucd", el, ns, True)
648
- observable = plane.Observable(plane.Ucd(ucd))
648
+ observable = plane.Observable(ucd)
649
649
  return observable
650
650
 
651
651
  def _get_point(self, point, ns, required):
@@ -2305,7 +2305,7 @@ class ObservationWriter(object):
2305
2305
  return
2306
2306
 
2307
2307
  element = self._get_caom_element("observable", parent)
2308
- self._add_element("ucd", observable.ucd.value, element)
2308
+ self._add_element("ucd", observable.ucd, element)
2309
2309
 
2310
2310
  def _add_transition_element(self, transition, parent):
2311
2311
  if transition is None:
{caom2-2.6.3 → caom2-2.6.4}/caom2/plane.py RENAMED
@@ -89,7 +89,7 @@ with warnings.catch_warnings():
89
89
  __all__ = ['CalibrationLevel', 'DataProductType', 'EnergyBand',
90
90
  'PolarizationState', 'Quality', 'Plane',
91
91
  'PlaneURI', 'DataQuality', 'Metrics', 'Provenance', 'Position',
92
- 'Energy', 'Polarization', 'Time', 'Observable', 'Ucd']
92
+ 'Energy', 'Polarization', 'Time', 'Observable']
93
93
 
94
94
 
95
95
  class CalibrationLevel(Enum):
@@ -108,14 +108,6 @@ class CalibrationLevel(Enum):
108
108
  ANALYSIS_PRODUCT = int_32(4)
109
109
 
110
110
 
111
- class Ucd(CaomObject):
112
- """ UCD - enum of UCDs"""
113
- _UCD_VOCAB = "https://ivoa.net/documents/UCD1+/20230125/ucd-list.txt"
114
-
115
- def __init__(self, value):
116
- self.value = value
117
-
118
-
119
111
  class DataProductType(OrderedEnum):
120
112
  """ DataproductType - enum of data product types"""
121
113
 
@@ -227,7 +219,7 @@ class Observable(CaomObject):
227
219
 
228
220
  @ucd.setter
229
221
  def ucd(self, value):
230
- caom_util.type_check(value, Ucd, 'ucd', override=False)
222
+ caom_util.type_check(value, str, 'ucd', override=False)
231
223
  self._ucd = value
232
224
 
233
225
 
caom2-2.6.4/caom2/version.py ADDED
@@ -0,0 +1 @@
1
+ version = '2.6.4'
{caom2-2.6.3 → caom2-2.6.4/caom2.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: caom2
3
- Version: 2.6.3
3
+ Version: 2.6.4
4
4
  Summary: CAOM-2.4 library
5
5
  Home-page: http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
6
6
  Author: Canadian Astronomy Data Centre
{caom2-2.6.3 → caom2-2.6.4}/setup.cfg RENAMED
@@ -38,7 +38,7 @@ license = AGPLv3
38
38
  url = http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
39
39
  edit_on_github = False
40
40
  github_project = opencadc/caom2tools
41
- version = 2.6.3
41
+ version = 2.6.4
42
42
 
43
43
  [options]
44
44
  install_requires =
caom2-2.6.3/caom2/version.py DELETED
@@ -1 +0,0 @@
1
- version = '2.6.3'
{caom2-2.6.3 → caom2-2.6.4}/LICENSE RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/MANIFEST.in RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/README.rst RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/__init__.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/artifact.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/caom_util.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/checksum.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/chunk.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/common.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/data/CAOM-2.2.xsd RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/data/CAOM-2.3.xsd RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/data/CAOM-2.4.xsd RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/diff.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/observation.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/part.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/shape.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/__init__.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_chunk.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_common.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_diffs.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_part.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_plane.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_shape.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/test_wcs.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/tests/xml_compare.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2/wcs.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/SOURCES.txt RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/not-zip-safe RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/caom2.egg-info/requires.txt RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/docs/Makefile RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/docs/conf.py RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/docs/index.rst RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/docs/make.bat RENAMED
File without changes
{caom2-2.6.3 → caom2-2.6.4}/setup.py RENAMED
File without changes