From 5f09e872ee57d95d2233c823cd52e6af888d716a Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Thu, 2 Nov 2023 13:45:27 -0400 Subject: [PATCH 1/2] updating gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 18969fbd..88e46209 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ *.o *.so __pycache__ +.pytest_cache +.eggs # Ignore .c files by default to avoid including generated code. If you want to # add a non-generated .c extension, use `git add -f filename.c`. @@ -16,6 +18,7 @@ htmlcov .coverage MANIFEST .ipynb_checkpoints +version.py # Sphinx docs/api @@ -51,6 +54,8 @@ distribute-*.tar.gz .project .pydevproject .settings +.vscode +.conda # Mac OSX .DS_Store From 14b4184c21c5a7f10b04d0502685e91659a60a7d Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Thu, 2 Nov 2023 13:45:59 -0400 Subject: [PATCH 2/2] Expanding ObservationIntentType to include outreach --- caom2/caom2/data/CAOM-2.4.xsd | 1 + caom2/caom2/observation.py | 1 + caom2/caom2/tests/test_observation.py | 2 ++ 3 files changed, 4 insertions(+) diff --git a/caom2/caom2/data/CAOM-2.4.xsd b/caom2/caom2/data/CAOM-2.4.xsd index 84028aa8..9a4c34b0 100644 --- a/caom2/caom2/data/CAOM-2.4.xsd +++ b/caom2/caom2/data/CAOM-2.4.xsd @@ -735,6 +735,7 @@ + diff --git a/caom2/caom2/observation.py b/caom2/caom2/observation.py index 7d5d8245..89861a30 100644 --- a/caom2/caom2/observation.py +++ b/caom2/caom2/observation.py @@ -100,6 +100,7 @@ class ObservationIntentType(OrderedEnum): """ SCIENCE = "science" CALIBRATION = "calibration" + OUTREACH = "outreach" class Status(Enum): diff --git a/caom2/caom2/tests/test_observation.py b/caom2/caom2/tests/test_observation.py index bd8f5533..a0f0fcfb 100644 --- a/caom2/caom2/tests/test_observation.py +++ b/caom2/caom2/tests/test_observation.py @@ -107,6 +107,8 @@ def test_all(self): "calibration") self.assertEqual(observation.ObservationIntentType.SCIENCE.value, "science") + self.assertEqual(observation.ObservationIntentType.OUTREACH.value, + "outreach") self.assertEqual(observation.Status.FAIL.value, "fail")