Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
#----------------------------------------------
- name: Install dependencies
# if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction
run: poetry install --no-interaction --no-root

#----------------------------------------------
# Create documentation and deploy.
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.12"]

steps:

Expand All @@ -28,13 +28,14 @@ jobs:
python-version: ${{ matrix.python-version }}

#----------------------------------------------
# install & configure poetry
# install & configure poetry via pip
#----------------------------------------------
- name: Install Poetry
uses: snok/install-poetry@v1.3
with:
virtualenvs-create: true
virtualenvs-in-project: true
run: |
python -m pip install --upgrade pip
pip install poetry
poetry config virtualenvs.create true
poetry config virtualenvs.in-project true

#----------------------------------------------
# load cached venv if cache exists
Expand All @@ -54,10 +55,10 @@ jobs:
run: poetry install --no-interaction --no-root

#----------------------------------------------
# install your root project, if required
#----------------------------------------------
# install your root project, if required
#----------------------------------------------
- name: Install library
run: poetry install --no-interaction
run: poetry install --no-interaction --no-root

#----------------------------------------------
# run test suite
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
virtualenvs-in-project: true

- name: Install dependencies
run: poetry install --no-interaction
run: poetry install --no-interaction --no-root

- name: Build source and wheel archives
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ setup: install gen-project gen-examples gendoc git-init-add
# install any dependencies required for building
install:
git init # issues/33
poetry install
poetry install --no-root
.PHONY: install

# ---
Expand Down
269 changes: 140 additions & 129 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ description = "modelcards linkml rendering"
authors = ["marcin p. joachimiak <marcinjoachimiak@gmail.com>"]
license = "MIT"
readme = "README.md"
include = ["README.md", "src/model_card_schema/schema", "project"]
include = ["README.md", "src/modelcards/schema", "src/linkml", "project"]
packages = [
{ include = "modelcards", from = "src" }
]

[tool.poetry.dependencies]
python = "^3.9"
Expand All @@ -16,7 +19,7 @@ enable = true
vcs = "git"
style = "pep440"

[tool.poetry.dev-dependencies]
[tool.poetry.group.dev.dependencies]
linkml = "^1.3.5"
mkdocs-material = "^8.2.8"
mkdocs-mermaid2-plugin = "^0.6.0"
Expand Down
10 changes: 4 additions & 6 deletions src/linkml/modelcards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -555,14 +555,12 @@ slots:
range: string

training_data_separate:
description: Training datasets (explicitly separated from evaluation)
multivalued: true
range: dataSet
description: Whether training data is separate/external
range: boolean

evaluation_data_separate:
description: Evaluation/test datasets (explicitly separated from training)
multivalued: true
range: dataSet
description: Whether evaluation data is separate/external
range: boolean

# Training/Evaluation Procedure slots
methodology:
Expand Down