Skip to content

Commit

Permalink
Merge pull request #86 from casework/release-0.9.0
Browse files Browse the repository at this point in the history
Release 0.9.0
  • Loading branch information
kchason authored Aug 29, 2023
2 parents 42d0581 + b7a7ea3 commit 623417c
Show file tree
Hide file tree
Showing 51 changed files with 5,107 additions and 5,036 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
strategy:
matrix:
python-version:
- '3.8'
- '3.9'
- '3.11'

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/supply-chain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# This workflow uses Make to review direct dependencies of this
# repository.

name: Continuous Integration
name: Supply Chain

on:
schedule:
Expand All @@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
python-version:
- '3.8'
- '3.9'
- '3.11'

steps:
Expand Down
11 changes: 8 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
[submodule "dependencies/CASE-Examples-QC"]
path = dependencies/CASE-Examples-QC
url = https://github.com/ajnelson-nist/CASE-Examples-QC.git
[submodule "dependencies/CASE-Examples"]
path = dependencies/CASE-Examples
url = https://github.com/casework/CASE-Examples.git
branch = master
[submodule "dependencies/casework.github.io"]
path = dependencies/casework.github.io
url = https://github.com/casework/casework.github.io.git
branch = master
[submodule "dependencies/prov"]
path = dependencies/prov
url = https://github.com/trungdong/prov.git
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

repos:
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
- repo: https://github.com/pycqa/isort
Expand Down
42 changes: 33 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ SHELL := /bin/bash
PYTHON3 ?= python3

all: \
.git_submodule_init.done.log \
.venv-pre-commit/var/.pre-commit-built.log
.venv-pre-commit/var/.pre-commit-built.log \
.git_submodule_init-casework.github.io.done.log
$(MAKE) \
PYTHON3=$(PYTHON3) \
--directory tests
Expand All @@ -32,11 +32,23 @@ all: \

.git_submodule_init.done.log: \
.gitmodules
git submodule init
git submodule update
git submodule update --init
touch $@

.git_submodule_init-CASE-Examples.done.log: \
dependencies/CASE-Examples/.gitmodules
$(MAKE) \
PYTHON3=$(PYTHON3) \
--directory dependencies/CASE-Examples \
.git_submodule_init.done.log
touch $@

.git_submodule_init-casework.github.io.done.log: \
.git_submodule_init-CASE-Examples.done.log \
dependencies/casework.github.io/.gitmodules
$(MAKE) \
PYTHON3=$(PYTHON3) \
--directory dependencies/CASE-Examples-QC \
--directory dependencies/casework.github.io \
.git_submodule_init.done.log
touch $@

Expand Down Expand Up @@ -64,7 +76,7 @@ all: \
touch $@

check: \
.git_submodule_init.done.log \
.git_submodule_init-casework.github.io.done.log \
.venv-pre-commit/var/.pre-commit-built.log
$(MAKE) \
--directory case_prov/shapes \
Expand Down Expand Up @@ -93,9 +105,9 @@ clean: \
--directory case_prov/shapes \
clean
@rm -f \
dependencies/CASE-Examples-QC/.git_submodule_init.done.log
@rm -f \
.git_submodule_init.done.log
.git_submodule_init.done.log \
dependencies/CASE-Examples/.git_submodule_init.done.log \
dependencies/casework.github.io/.git_submodule_init.done.log

clean-figures:
@$(MAKE) \
Expand All @@ -107,6 +119,18 @@ clean-tests:
--directory tests \
clean

# This recipe guarantees a timestamp update order, and is otherwise a nop.
dependencies/CASE-Examples/.gitmodules: \
.git_submodule_init.done.log
test -r $@
touch $@

# This recipe guarantees a timestamp update order, and is otherwise a nop.
dependencies/casework.github.io/.gitmodules: \
.git_submodule_init.done.log
test -r $@
touch $@

distclean: \
clean
@rm -rf \
Expand Down
2 changes: 1 addition & 1 deletion case_prov/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# We would appreciate acknowledgement if the software is used.

__version__ = "0.8.0"
__version__ = "0.9.0"

import datetime
import typing
Expand Down
2 changes: 1 addition & 1 deletion case_prov/shapes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ all: \
.%.ttl-check: \
%.ttl \
$(top_srcdir)/.git_submodule_init.done.log
java -jar $(top_srcdir)/dependencies/CASE-Examples-QC/dependencies/CASE-Examples/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar \
java -jar $(top_srcdir)/dependencies/CASE-Examples/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar \
--inline-blank-nodes \
--source $< \
--source-format turtle \
Expand Down
1 change: 1 addition & 0 deletions dependencies/CASE-Examples
Submodule CASE-Examples added at 689d31
1 change: 0 additions & 1 deletion dependencies/CASE-Examples-QC
Submodule CASE-Examples-QC deleted from bea92b
1 change: 1 addition & 0 deletions dependencies/casework.github.io
Submodule casework.github.io added at 77d39a
2 changes: 1 addition & 1 deletion figures/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SHELL := /bin/bash

top_srcdir := $(shell cd .. ; pwd)

rdf_toolkit_jar := $(top_srcdir)/dependencies/CASE-Examples-QC/dependencies/CASE-Examples/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar
rdf_toolkit_jar := $(top_srcdir)/dependencies/CASE-Examples/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar

all: \
readme-actions-ordered-by-timestamp-constraints.log \
Expand Down
28 changes: 14 additions & 14 deletions figures/readme-actions-ordered-by-timestamp-invisible.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 623417c

Please sign in to comment.