Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(DO NOT MERGE) Bump case utils, ignore uco validator build #24

Closed
wants to merge 2 commits into from
Closed

(DO NOT MERGE) Bump case utils, ignore uco validator build #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
318c120
Bump case_utils to 0.2.1 to address rdflib-jsonld package retirement
ajnelson-nist Sep 7, 2021
b3b2d04
(DO NOT MERGE) Remove Validator from build chain for CI demo
ajnelson-nist Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ all: \
# for someone developing with different submodule pointers.
.git_submodule_init.done.log: \
.gitmodules
# UCO-Utility-Pre-0.7.0-Validator
test -r dependencies/UCO-Utility-Pre-0.7.0-Validator/README.md \
|| (git submodule init dependencies/UCO-Utility-Pre-0.7.0-Validator && git submodule update dependencies/UCO-Utility-Pre-0.7.0-Validator)
@test -r dependencies/UCO-Utility-Pre-0.7.0-Validator/README.md \
|| (echo "ERROR:Makefile:UCO-Utility-Pre-0.7.0-Validator submodule README.md file not found, even though UCO-Utility-Pre-0.7.0-Validator submodule initialized." >&2 ; exit 2)
# CASE-Utilities-Python
test -r dependencies/CASE-Utilities-Python/README.md \
|| (git submodule init dependencies/CASE-Utilities-Python && git submodule update dependencies/CASE-Utilities-Python)
Expand Down Expand Up @@ -76,11 +71,6 @@ all: \
source venv/bin/activate \
&& pip install \
dependencies/CASE-Utilities-Python
source venv/bin/activate \
&& cd dependencies/UCO-Utility-Pre-0.7.0-Validator \
&& pip install \
--editable \
src
touch $@

check: \
Expand All @@ -89,7 +79,8 @@ check: \
--directory dependencies \
check
$(MAKE) \
--directory examples/illustrations
--directory examples/illustrations \
check

clean:
@$(MAKE) \
Expand Down
2 changes: 1 addition & 1 deletion dependencies/CASE-Utilities-Python
Open in desktop
Submodule CASE-Utilities-Python updated 5 files
+1 −5 .github/workflows/ci.yml
+1 −1 case_utils/__init__.py
+1 −1 dependencies/CASE-Examples-QC
+3 −4 setup.cfg
+1 −2 tests/Makefile
32 changes: 2 additions & 30 deletions dependencies/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,12 @@ SHELL := /bin/bash

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

all: \
case-0.3.0.pkl \
case-0.4.0.pkl
all:

case-0.3.0.pkl: \
$(top_srcdir)/.venv.done.log
source $(top_srcdir)/venv/bin/activate \
&& serialize \
-c case-0.3.0 \
-o _$@ \
CASE-0.3.0/
mv _$@ $@

case-0.4.0.pkl: \
$(top_srcdir)/.venv.done.log
source $(top_srcdir)/venv/bin/activate \
&& serialize \
-c case-0.4.0 \
-o _$@ \
CASE-0.4.0/
mv _$@ $@

check: \
case-0.3.0.pkl \
case-0.4.0.pkl
check:
$(MAKE) \
--directory CASE-0.3.0 \
check
$(MAKE) \
--directory CASE-0.4.0 \
check
source $(top_srcdir)/venv/bin/activate \
&& describe \
case-0.3.0.pkl
source $(top_srcdir)/venv/bin/activate \
&& describe \
case-0.4.0.pkl
20 changes: 0 additions & 20 deletions examples/illustrations/exif_data/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,9 @@ top_srcdir := $(shell cd ../../.. ; pwd)
all: \
query-select-files.md

.PHONY: \
check-0.3.0 \
check-0.4.0

check: \
check-0.3.0 \
check-0.4.0 \
query-select-files.md

check-0.3.0: \
$(top_srcdir)/.dependencies.done.log
source $(top_srcdir)/venv/bin/activate \
&& validate \
$(top_srcdir)/dependencies/case-0.3.0.pkl \
exif_data.json

check-0.4.0: \
$(top_srcdir)/.dependencies.done.log
source $(top_srcdir)/venv/bin/activate \
&& validate \
$(top_srcdir)/dependencies/case-0.4.0.pkl \
exif_data.json

clean:
@rm -f \
query-*.md
Expand Down
22 changes: 1 addition & 21 deletions examples/illustrations/location/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,4 @@ top_srcdir := $(shell cd ../../.. ; pwd)

all:

.PHONY: \
check-0.3.0 \
check-0.4.0

check: \
check-0.3.0 \
check-0.4.0

check-0.3.0: \
$(top_srcdir)/.dependencies.done.log
source $(top_srcdir)/venv/bin/activate \
&& validate \
$(top_srcdir)/dependencies/case-0.3.0.pkl \
location.json

check-0.4.0: \
$(top_srcdir)/.dependencies.done.log
source $(top_srcdir)/venv/bin/activate \
&& validate \
$(top_srcdir)/dependencies/case-0.4.0.pkl \
location.json
check: