Skip to content

Commit

Permalink
Update CASE ontology pointer to version 1.2.0 (prerelease state)
Browse files Browse the repository at this point in the history
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 <alexander.nelson@nist.gov>
  • Loading branch information
ajnelson-nist committed Mar 28, 2023
1 parent 1e95e4e commit d297361
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
21 changes: 11 additions & 10 deletions case_utils/ontology/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,16 @@ all: \
.PRECIOUS: \
case-$(case_version).ttl

$(case_srcdir)/.venv.done.log: \
$(top_srcdir)/.git_submodule_init.done.log
$(MAKE) \
--directory $(case_srcdir) \
.venv.done.log
touch -c $@
test -r $@

case-$(case_version).ttl: \
$(top_srcdir)/.git_submodule_init.done.log \
$(case_srcdir)/.venv.done.log \
$(RDF_TOOLKIT_JAR)
$(MAKE) \
--directory $(case_srcdir)/tests \
Expand All @@ -47,10 +55,7 @@ case-$(case_version)-subclasses.ttl: \
# release is being made, that step will have been skipped.
# This recursive Make call guarantees the virtual environment is
# set up.
$(MAKE) \
--directory $(case_srcdir)/tests \
.venv.done.log
source $(case_srcdir)/tests/venv/bin/activate \
source $(case_srcdir)/venv/bin/activate \
&& python3 src/subclasses_ttl.py \
__$@ \
$<
Expand All @@ -70,11 +75,7 @@ clean:
ontology_and_version_iris.txt: \
src/ontology_and_version_iris.py \
case-$(case_version)-subclasses.ttl
# Guarantee venv is built. (Same rationale as in the subclasses.ttl recipe.)
$(MAKE) \
--directory $(case_srcdir)/tests \
.venv.done.log
source $(case_srcdir)/tests/venv/bin/activate \
source $(case_srcdir)/venv/bin/activate \
&& python3 src/ontology_and_version_iris.py \
_$@ \
case-*.ttl
Expand Down
3 changes: 2 additions & 1 deletion case_utils/ontology/version_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
__all__ = ["CURRENT_CASE_VERSION", "built_version_choices_list"]

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

# Tested with CI to match set of ontology files available.
built_version_choices_list = [
Expand All @@ -34,6 +34,7 @@
"case-0.7.0",
"case-0.7.1",
"case-1.0.0",
"case-1.1.0",
"case-" + CURRENT_CASE_VERSION,
]

Expand Down
3 changes: 2 additions & 1 deletion tests/case_utils/case_validate/uco_test_examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ validation_ttls := \
location_XFAIL_validation.ttl \
message_thread_PASS_validation.ttl \
message_thread_XFAIL_validation.ttl \
observable_creation_time_PASS_validation.ttl \
owl_axiom_PASS_validation.ttl \
owl_axiom_XFAIL_validation.ttl \
owl_properties_PASS_validation.ttl \
Expand Down Expand Up @@ -78,7 +79,7 @@ all: \
$(top_srcdir)/case_utils/ontology/__init__.py
source $(tests_srcdir)/venv/bin/activate \
&& case_validate \
--allow-infos \
--allow-warnings \
--debug \
--format turtle \
$< \
Expand Down

0 comments on commit d297361

Please sign in to comment.