Skip to content

Commit d297361

Browse files
committed
Update CASE ontology pointer to version 1.2.0 (prerelease state)
This patch, normally a brief edit of `version_info.py`, also makes path updates to the virtual environments that were enacted as part of UCO Issue 449. Test updates made for UCO Issue 508 are also forward-ported. A follow-on patch will regenerate Make-managed files. References: * ucoProject/UCO#449 * ucoProject/UCO#508 Signed-off-by: Alex Nelson <[email protected]>
1 parent 1e95e4e commit d297361

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

case_utils/ontology/Makefile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,16 @@ all: \
2929
.PRECIOUS: \
3030
case-$(case_version).ttl
3131

32+
$(case_srcdir)/.venv.done.log: \
33+
$(top_srcdir)/.git_submodule_init.done.log
34+
$(MAKE) \
35+
--directory $(case_srcdir) \
36+
.venv.done.log
37+
touch -c $@
38+
test -r $@
39+
3240
case-$(case_version).ttl: \
33-
$(top_srcdir)/.git_submodule_init.done.log \
41+
$(case_srcdir)/.venv.done.log \
3442
$(RDF_TOOLKIT_JAR)
3543
$(MAKE) \
3644
--directory $(case_srcdir)/tests \
@@ -47,10 +55,7 @@ case-$(case_version)-subclasses.ttl: \
4755
# release is being made, that step will have been skipped.
4856
# This recursive Make call guarantees the virtual environment is
4957
# set up.
50-
$(MAKE) \
51-
--directory $(case_srcdir)/tests \
52-
.venv.done.log
53-
source $(case_srcdir)/tests/venv/bin/activate \
58+
source $(case_srcdir)/venv/bin/activate \
5459
&& python3 src/subclasses_ttl.py \
5560
__$@ \
5661
$<
@@ -70,11 +75,7 @@ clean:
7075
ontology_and_version_iris.txt: \
7176
src/ontology_and_version_iris.py \
7277
case-$(case_version)-subclasses.ttl
73-
# Guarantee venv is built. (Same rationale as in the subclasses.ttl recipe.)
74-
$(MAKE) \
75-
--directory $(case_srcdir)/tests \
76-
.venv.done.log
77-
source $(case_srcdir)/tests/venv/bin/activate \
78+
source $(case_srcdir)/venv/bin/activate \
7879
&& python3 src/ontology_and_version_iris.py \
7980
_$@ \
8081
case-*.ttl

case_utils/ontology/version_info.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
__all__ = ["CURRENT_CASE_VERSION", "built_version_choices_list"]
2525

2626
# Tested with CI to match versionInfo of <https://ontology.caseontology.org/case/case>.
27-
CURRENT_CASE_VERSION: str = "1.1.0"
27+
CURRENT_CASE_VERSION: str = "1.2.0"
2828

2929
# Tested with CI to match set of ontology files available.
3030
built_version_choices_list = [
@@ -34,6 +34,7 @@
3434
"case-0.7.0",
3535
"case-0.7.1",
3636
"case-1.0.0",
37+
"case-1.1.0",
3738
"case-" + CURRENT_CASE_VERSION,
3839
]
3940

tests/case_utils/case_validate/uco_test_examples/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ validation_ttls := \
4343
location_XFAIL_validation.ttl \
4444
message_thread_PASS_validation.ttl \
4545
message_thread_XFAIL_validation.ttl \
46+
observable_creation_time_PASS_validation.ttl \
4647
owl_axiom_PASS_validation.ttl \
4748
owl_axiom_XFAIL_validation.ttl \
4849
owl_properties_PASS_validation.ttl \
@@ -78,7 +79,7 @@ all: \
7879
$(top_srcdir)/case_utils/ontology/__init__.py
7980
source $(tests_srcdir)/venv/bin/activate \
8081
&& case_validate \
81-
--allow-infos \
82+
--allow-warnings \
8283
--debug \
8384
--format turtle \
8485
$< \

0 commit comments

Comments
 (0)