Skip to content

Commit 806aaf2

Browse files
realmarcinclaude
andcommitted
Merge origin/main into html branch
Resolved poetry.lock merge conflict by regenerating the lock file from pyproject.toml. This brings the html branch up to date with the latest main branch changes including the modules merge (PR #38). Fixes conflicts in PR #42. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
2 parents b178328 + 837003e commit 806aaf2

File tree

259 files changed

+35299
-31924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+35299
-31924
lines changed

Makefile

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN = poetry run
1111
SCHEMA_NAME = $(shell ${SHELL} ./utils/get-value.sh name)
1212
SOURCE_SCHEMA_PATH = $(shell ${SHELL} ./utils/get-value.sh source_schema_path)
1313
SOURCE_SCHEMA_DIR = $(dir $(SOURCE_SCHEMA_PATH))
14+
SOURCE_SCHEMA_ALL = $(SOURCE_SCHEMA_DIR)$(patsubst %.yaml,%_all.yaml,$(notdir $(SOURCE_SCHEMA_PATH)))
1415
SRC = src
1516
DEST = project
1617
PYMODEL = $(SRC)/$(SCHEMA_NAME)/datamodel
@@ -101,15 +102,27 @@ compile-sheets:
101102
gen-examples:
102103
cp src/data/examples/* $(EXAMPLEDIR)
103104

105+
# Build the combined schema
106+
# Also write proper yaml header to it
107+
.PHONY: full-schema
108+
full-schema: $(SOURCE_SCHEMA_ALL)
109+
110+
$(SOURCE_SCHEMA_ALL):
111+
@echo "Generating D4D-Full schema with merged imports..."
112+
$(RUN) gen-linkml -o $@ -f 'yaml' $(SOURCE_SCHEMA_PATH)
113+
@echo '---' | cat - $@ > $@.tmp && mv $@.tmp $@
114+
104115
# generates all project files
105116

106-
gen-project: $(PYMODEL)
117+
gen-project: $(PYMODEL) $(SOURCE_SCHEMA_ALL)
107118
$(RUN) gen-project -I python -I jsonschema -I jsonld -I owl ${GEN_PARGS} -d $(DEST) $(SOURCE_SCHEMA_PATH) && mv $(DEST)/*.py $(PYMODEL)
108119

120+
109121
test: test-schema test-python test-examples
110122

111-
test-schema:
112-
$(RUN) gen-project ${GEN_PARGS} -d tmp $(SOURCE_SCHEMA_PATH)
123+
# Test the schema - use the full materialized version
124+
test-schema: $(SOURCE_SCHEMA_ALL)
125+
$(RUN) gen-project ${GEN_PARGS} -d tmp $(SOURCE_SCHEMA_ALL)
113126

114127
test-python:
115128
$(RUN) python -m unittest discover

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Executive Order 14168: This repository is under review for potential modification in compliance with Administration directives.
2+
13
# data-sheets-schema
24

35
A LinkML schema for Datasheets for Datasets model as published in [Datasheets for Datasets](https://m-cacm.acm.org/magazines/2021/12/256932-datasheets-for-datasets/fulltext). Inspired by datasheets as used in the electronics and other industries, Gebru et al. proposed that every dataset "be accompanied with a datasheet that documents its motivation, composition, collection process, recommended uses, and so on". To this end the authors create a series of topics and over 50 questions addressing different aspects of datasets, also useful in an AI/ML context. An example of completed datasheet for datasets can be found here:

0 commit comments

Comments
 (0)