Skip to content

Commit

Permalink
Merge pull request #70 from casework/Release-0.5.0
Browse files Browse the repository at this point in the history
Release 0.5.0
  • Loading branch information
plbt5 authored Oct 26, 2021
2 parents 70e8aaa + 2301173 commit dc129d5
Show file tree
Hide file tree
Showing 17 changed files with 652 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*.pyo

# Unit testing files
.lib.done.log
.*.done.log
.*.ttl

# Pycharm files
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "dependencies/UCO"]
path = dependencies/UCO
url = https://github.com/ucoProject/UCO.git
18 changes: 18 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
2021-10-26
* ONT-437: Release CASE 0.5.0, with release notes at https://caseontology.org/releases/0.5.0/

2021-09-17
* (21b3a1c) ONT-456, CP-41: Converted current property restrictions and domain assertions to SHACL class shapes
* CP-41: https://drive.google.com/file/d/1sKFTTiEe-LmQLEG1Bowf52QF1VPZDssL/view
* (1652d7c) ONT-455, CP-40: Adopted UCO 0.7.0 as a Git submodule
* CP-40: https://drive.google.com/file/d/1JqPx0ngdFKGxxOgGD1UgwuT9LgM4SKUV/view
* (b82a101) ONT-462, CP-42: Removed investigation-namespaced startTime and endTime properties from investigation-da.ttl
* CP-42: https://drive.google.com/file/d/1JDkSrI7bpVtr2aJ_8lLLa0BrLnBKpEOp/view

2021-09-08
* (f79ac53) ONT-442, CP-37: Fixed broken link to website examples gallery in README
* CP-37: https://drive.google.com/file/d/16maCSg22Tfwro3OXajT6aYXfLhiihgL4/view

2021-06-02
* ONT-400: Release CASE 0.4.0, with release notes at https://caseontology.org/releases/0.4.0/

2021-06-01
* (b9f0f7b) ONT-435, CP-34: Revised CASE IRI structure to support granular resource service (applied for CASE 0.4.0)
* CP-34: https://drive.google.com/file/d/1J2UeRVeG_CCloTwo9Do628zvWcIpO5GR/view
Expand Down
42 changes: 41 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,61 @@
#
# We would appreciate acknowledgement if the software is used.

SHELL := /bin/bash

PYTHON3 ?= $(shell which python3.9 2>/dev/null || which python3.8 2>/dev/null || which python3.7 2>/dev/null || which python3.6 2>/dev/null || which python3)

all:

# This recipe guarantees that 'git submodule init' and 'git submodule update' have run at least once.
# The recipe avoids running 'git submodule update' more than once, in case a user is testing with the submodule at a different commit than what CASE tracks.
.git_submodule_init.done.log: \
.gitmodules
# UCO
test -r dependencies/UCO/README.md \
|| (git submodule init dependencies/UCO && git submodule update dependencies/UCO)
@test -r dependencies/UCO/README.md \
|| (echo "ERROR:Makefile:UCO submodule README.md file not found, even though that submodule is initialized." >&2 ; exit 2)
$(MAKE) \
--directory dependencies/UCO \
.git_submodule_init.done.log
touch $@

.lib.done.log:
$(MAKE) \
--directory lib
touch $@

check: \
.git_submodule_init.done.log \
.lib.done.log
$(MAKE) \
--directory ontology \
check
$(MAKE) \
PYTHON3=$(PYTHON3) \
--directory tests \
check

clean:
@rm -f .lib.done.log
@$(MAKE) \
--directory tests \
clean
@$(MAKE) \
--directory ontology \
clean
@test ! -r dependencies/UCO/README.md \
|| $(MAKE) \
--directory dependencies/UCO \
clean
@# Restore UCO validation output files that do not affect CASE build process.
@test ! -r dependencies/UCO/README.md \
|| ( \
cd dependencies/UCO \
&& git checkout \
-- \
tests/examples \
|| true \
)
@rm -f \
.*.done.log
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The CASE Ontology Committee models domain concepts, developing the knowledge enc

Example CASE data and narratives can be found at these locations:

* The [CASE Topics Gallery](https://caseontology.org/ontology/gallery.html)
* The [CASE Topics Gallery](https://caseontology.org/examples/)
* The [CASE Examples Repository](https://github.com/casework/CASE-Examples)

## I have a question!
Expand Down
1 change: 1 addition & 0 deletions dependencies/UCO
Submodule UCO added at c83bbc
16 changes: 1 addition & 15 deletions ontology/investigation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,9 @@ all:
--target-format turtle
mv _$@ $@

.check-investigation-da.ttl: \
$(top_srcdir)/.lib.done.log \
investigation-da.ttl
java -jar $(top_srcdir)/lib/rdf-toolkit.jar \
--infer-base-iri \
--inline-blank-nodes \
--source investigation-da.ttl \
--source-format turtle \
--target _$@ \
--target-format turtle
mv _$@ $@

check: \
.check-investigation.ttl \
.check-investigation-da.ttl
.check-investigation.ttl
diff investigation.ttl .check-investigation.ttl
diff investigation-da.ttl .check-investigation-da.ttl

clean:
@rm -f \
Expand Down
59 changes: 0 additions & 59 deletions ontology/investigation/investigation-da.ttl

This file was deleted.

Loading

0 comments on commit dc129d5

Please sign in to comment.