diff --git a/.github/workflows/deploy_site.yml b/.github/workflows/deploy_site.yml index a1365b76..1b51a7f3 100644 --- a/.github/workflows/deploy_site.yml +++ b/.github/workflows/deploy_site.yml @@ -42,7 +42,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install -r requirements.txt + python -m pip install uv + uv sync --project=src --no-dev - name: Setup Pages uses: actions/configure-pages@v5 @@ -50,7 +51,7 @@ jobs: - name: Build Site run: | export PYTHONPATH=src:$PYTHONPATH - mkdocs build --verbose --clean --config-file mkdocs.yml + uv run --project=src mkdocs build --clean --config-file mkdocs.yml - name: Upload artifact uses: actions/upload-pages-artifact@v4 diff --git a/.github/workflows/link_checker.yml b/.github/workflows/link_checker.yml index e80c55dc..92f87994 100644 --- a/.github/workflows/link_checker.yml +++ b/.github/workflows/link_checker.yml @@ -12,6 +12,7 @@ on: - .github/workflows/linkchecker.yml # run on any PR that changes the pip requirements - requirements.txt + - src/pyproject.toml # let us trigger it manually workflow_dispatch: @@ -30,7 +31,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip uv - uv sync --dev --project src + uv sync --dev --project=src - name: Build Site run: | diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 29d921f8..05f5f658 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -29,8 +29,6 @@ jobs: run: | python -m pip install --upgrade pip uv uv sync --project=src --dev --frozen -# pip install pytest build -# if [ -f requirements.txt ]; then pip install -r requirements.txt; fi # - uses: psf/black@stable - name: Test with pytest run: | diff --git a/data/schema/current/Decision_Point.schema.json b/data/schema/current/Decision_Point.schema.json index 7ced5970..7c5009fd 120000 --- a/data/schema/current/Decision_Point.schema.json +++ b/data/schema/current/Decision_Point.schema.json @@ -1 +1 @@ -../v2/Decision_Point-2-0-0.schema.json \ No newline at end of file +../v2/DecisionPoint_2_0_0.schema.json \ No newline at end of file diff --git a/data/schema/current/Decision_Point_Value_Selection.schema.json b/data/schema/current/Decision_Point_Value_Selection.schema.json index 4aed9da4..621d962d 120000 --- a/data/schema/current/Decision_Point_Value_Selection.schema.json +++ b/data/schema/current/Decision_Point_Value_Selection.schema.json @@ -1 +1 @@ -../v2/Decision_Point_Value_Selection-2-0-0.schema.json \ No newline at end of file +../v2/SelectionList_2_0_0.schema.json \ No newline at end of file diff --git a/data/schema/current/Decision_Table.schema.json b/data/schema/current/Decision_Table.schema.json index 28cbc1c8..8c32fc6d 120000 --- a/data/schema/current/Decision_Table.schema.json +++ b/data/schema/current/Decision_Table.schema.json @@ -1 +1 @@ -../v2/Decision_Table-2-0-0.schema.json \ No newline at end of file +../v2/DecisionTable_2_0_0.schema.json \ No newline at end of file diff --git a/data/schema/v2/Decision_Point-2-0-0.schema.json b/data/schema/v2/Decision_Point-2-0-0.schema.json new file mode 120000 index 00000000..338da14d --- /dev/null +++ b/data/schema/v2/Decision_Point-2-0-0.schema.json @@ -0,0 +1 @@ +DecisionPoint_2_0_0.schema.json \ No newline at end of file diff --git a/data/schema/v2/Decision_Point_Group-2-0-0.schema.json b/data/schema/v2/Decision_Point_Group-2-0-0.schema.json new file mode 120000 index 00000000..1d739f41 --- /dev/null +++ b/data/schema/v2/Decision_Point_Group-2-0-0.schema.json @@ -0,0 +1 @@ +DecisionPointGroup_2_0_0.schema.json \ No newline at end of file diff --git a/data/schema/v2/Decision_Point_Value_Selection-2-0-0.schema.json b/data/schema/v2/Decision_Point_Value_Selection-2-0-0.schema.json new file mode 120000 index 00000000..c3a73af7 --- /dev/null +++ b/data/schema/v2/Decision_Point_Value_Selection-2-0-0.schema.json @@ -0,0 +1 @@ +SelectionList_2_0_0.schema.json \ No newline at end of file diff --git a/data/schema/v2/Decision_Table-2-0-0.schema.json b/data/schema/v2/Decision_Table-2-0-0.schema.json new file mode 120000 index 00000000..0769660f --- /dev/null +++ b/data/schema/v2/Decision_Table-2-0-0.schema.json @@ -0,0 +1 @@ +DecisionTable_2_0_0.schema.json \ No newline at end of file diff --git a/data/schema/v2/README.md b/data/schema/v2/README.md new file mode 100644 index 00000000..ef92a659 --- /dev/null +++ b/data/schema/v2/README.md @@ -0,0 +1,9 @@ +# SSVC JSON Schemas v2 Readme + +## Why are there soft links here? + +We are now automatically generating the schema files for SSVC based on their +corresponding Pydantic models. This allows us to keep the schema files in sync +with the code more easily. However, it required us to make some changes to the +file names. So we've left behind some soft links from the original file names +to help ease the transition. \ No newline at end of file diff --git a/data/schema/v2/Ssvc_Object_Registry-2-0-0.schema.json b/data/schema/v2/Ssvc_Object_Registry-2-0-0.schema.json new file mode 120000 index 00000000..5a33efc3 --- /dev/null +++ b/data/schema/v2/Ssvc_Object_Registry-2-0-0.schema.json @@ -0,0 +1 @@ +SsvcObjectRegistry_2_0_0.schema.json \ No newline at end of file