Update spdx-python-model to 0.0.6

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>

Author: bact

.github/workflows/install_and_test.yml

@@ -36,13 +36,6 @@ jobs:
           python -m pip install tzdata
           python -m pip install networkx
         shell: bash
-      - name: Install SPDX 3 bindings
-        # The spdx-python-model bindings are built from git and their build-time
-        # code generation does not currently work on Windows; install them only
-        # where they build so the SPDX 3 tests run there (and are skipped elsewhere).
-        if: runner.os != 'Windows'
-        run: python -m pip install ".[spdx3]"
-        shell: bash
       - name: Run tests
         run: pytest
       - name: Run CLI

pyproject.toml

@@ -37,6 +37,7 @@ dependencies = [
     "pyyaml",
     "rdflib",
     "semantic_version",
+    "spdx-python-model>=0.0.6",
     "uritools",
     "xmltodict",
 ]
@@ -46,12 +47,6 @@ dynamic = ["version"]
 test = ["pyshacl", "pytest", "tzdata"]
 code_style = ["black", "flake8", "isort", "mypy"]
 graph_generation = ["networkx", "pygraphviz"]
-# Experimental SPDX 3.0 support is built on the spdx-python-model bindings.
-# It is an optional extra (not a core dependency) because the bindings are not
-# yet published to PyPI and must be built from git, where the build-time code
-# generation does not currently work on Windows. Keeping it optional ensures the
-# core package installs on all platforms. Install with: pip install ".[spdx3]"
-spdx3 = ["spdx-python-model @ git+https://github.com/spdx/spdx-python-model.git@main"]
 development = ["black", "flake8", "isort", "mypy", "networkx", "pyshacl", "pytest"]
 
 [project.scripts]

src/spdx_tools/spdx3/py.typed

@@ -1,11 +1,2 @@
 # SPDX-FileCopyrightText: 2026-present SPDX contributors
 # SPDX-License-Identifier: Apache-2.0
-
-# The SPDX 3 support depends on the optional `spdx-python-model` bindings, which
-# are not installed by default and currently cannot be built from git on Windows.
-# When the bindings are unavailable, skip collecting the SPDX 3 test suite instead
-# of failing at import time.
-try:
-    import spdx_python_model  # noqa: F401
-except ImportError:
-    collect_ignore_glob = ["*"]

tests/spdx3/conftest.py

@@ -29,7 +29,9 @@ def test_render_creation_info():
     output_str = io.StringIO()
     write_spdx_document(spdx_document, text_output=output_str)
 
-    assert output_str.getvalue() == """\
+    assert (
+        output_str.getvalue()
+        == """\
 ## SPDX Document
 SPDXID: SPDXRef-FOO
 name: BAR
@@ -38,5 +40,7 @@ def test_render_creation_info():
   created: 2024-01-01T00:00:00Z
   profile: SOFTWARE
   data license: CC0-1.0
-elements: 
-"""  # noqa: W291 # elements: are printed with a space
+elements: \
+
+"""  # noqa: W291 # elements: are printed with trailing space
+    )