Skip to content

Commit

Permalink
Merge pull request #93 from casework/release-0.9.1
Browse files Browse the repository at this point in the history
Release 0.9.1
  • Loading branch information
kchason authored Oct 25, 2023
2 parents 623417c + e4a5949 commit 9dcda0f
Show file tree
Hide file tree
Showing 136 changed files with 2,155 additions and 9,131 deletions.
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
# Portions of this file contributed by NIST are governed by the following
# statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

# This workflow uses Make to review direct dependencies of this
# repository.

name: Supply Chain
name: Prerelease

on:
schedule:
- cron: '15 5 * * 1,2,3,4,5'
pull_request:
branches:
- main

jobs:
build:
Expand All @@ -35,4 +39,4 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Review dependencies
run: make check-supply-chain
run: make check-supply-chain-pre-commit
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[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
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

repos:
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 23.10.1
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
Expand Down
17 changes: 1 addition & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,7 @@ all: \
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) \
Expand Down Expand Up @@ -90,6 +81,7 @@ check: \
check-supply-chain: \
check-supply-chain-pre-commit

# This target is scheduled to run as part of prerelease review.
check-supply-chain-pre-commit: \
.venv-pre-commit/var/.pre-commit-built.log
source .venv-pre-commit/bin/activate \
Expand All @@ -106,7 +98,6 @@ clean: \
clean
@rm -f \
.git_submodule_init.done.log \
dependencies/CASE-Examples/.git_submodule_init.done.log \
dependencies/casework.github.io/.git_submodule_init.done.log

clean-figures:
Expand All @@ -119,12 +110,6 @@ 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
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.9.0"
__version__ = "0.9.1"

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/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar \
java -jar $(top_srcdir)/dependencies/casework.github.io/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar \
--inline-blank-nodes \
--source $< \
--source-format turtle \
Expand Down
1 change: 0 additions & 1 deletion dependencies/CASE-Examples
Submodule CASE-Examples deleted from 689d31
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/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar
rdf_toolkit_jar := $(top_srcdir)/dependencies/casework.github.io/dependencies/CASE-develop/dependencies/UCO/lib/rdf-toolkit.jar

all: \
readme-actions-ordered-by-timestamp-constraints.log \
Expand Down
2 changes: 1 addition & 1 deletion 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.
38 changes: 19 additions & 19 deletions figures/readme-actions-ordered-by-timestamp-visible.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions figures/readme-activities-related-by-intervals-visible.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 9dcda0f

Please sign in to comment.