From edccf654b4295eb71c7421ddc775547d0912352b Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 18 Sep 2024 19:28:18 +0200 Subject: [PATCH 1/7] add fixed `cdx:py:...` properties Signed-off-by: Jan Kowalleck --- cyclonedx_py/_internal/__init__.py | 22 ++++++++++++++++------ cyclonedx_py/_internal/cli.py | 4 ++-- cyclonedx_py/_internal/environment.py | 14 ++++++++++---- cyclonedx_py/_internal/pipenv.py | 2 +- cyclonedx_py/_internal/poetry.py | 4 ++-- cyclonedx_py/_internal/requirements.py | 2 +- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/cyclonedx_py/_internal/__init__.py b/cyclonedx_py/_internal/__init__.py index 0fec109a..7c6f2056 100644 --- a/cyclonedx_py/_internal/__init__.py +++ b/cyclonedx_py/_internal/__init__.py @@ -45,22 +45,27 @@ def __call__(self, **kwargs: Any) -> 'Bom': # pragma: no cover ... -class PropertyName(Enum): +class PropertyValue(Enum): # region general # see https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx.md BooleanTrue = 'true' BooleanFalse = 'false' + # endregion general + +class PropertyName(Enum): + # region general + # see https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx.md Reproducible = 'cdx:reproducible' # endregion general # region python # see https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/python.md - PackageExtra = 'cdx:python:package:required-extra' - PackageSourceSubdirectory = 'cdx:python:package:source:subdirectory' - PackageSourceVcsRequestedRevision = 'cdx:poetry:package:source:vcs:requested_revision' - PackageSourceVcsCommitId = 'cdx:poetry:package:source:vcs:commit_id' - PackageSourceLocalEditable = 'cdx:python:package:source:local:editable' + PythonPackageExtra = 'cdx:python:package:required-extra' + PythonPackageSourceSubdirectory = 'cdx:python:package:source:subdirectory' + PythonPackageSourceVcsRequestedRevision = 'cdx:python:package:source:vcs:requested_revision' + PythonPackageSourceVcsCommitId = 'cdx:python:package:source:vcs:commit_id' + PythonPackageSourceLocalEditable = 'cdx:python:package:source:local:editable' # endregion python # region poetry @@ -68,6 +73,11 @@ class PropertyName(Enum): PoetryGroup = 'cdx:poetry:group' PoetryPackageSourceReference = 'cdx:poetry:source:package:reference' PoetryPackageSourceResolvedReference = 'cdx:poetry:package:source:resolved_reference' + # region poetry-deprecated + # the following property names are deprecated + PoetryPackageSourceVcsRequestedRevision = 'cdx:poetry:package:source:vcs:requested_revision' + PoetryPackageSourceVcsCommitId = 'cdx:poetry:package:source:vcs:commit_id' + # endregion poetry-deprecated # endregion poetry # region pipenv diff --git a/cyclonedx_py/_internal/cli.py b/cyclonedx_py/_internal/cli.py index d8efc472..e3cd2fce 100644 --- a/cyclonedx_py/_internal/cli.py +++ b/cyclonedx_py/_internal/cli.py @@ -27,7 +27,7 @@ from cyclonedx.validation import make_schemabased_validator from .. import __version__ -from . import PropertyName +from . import PropertyName, PropertyValue from .environment import EnvironmentBB from .pipenv import PipenvBB from .poetry import PoetryBB @@ -230,7 +230,7 @@ def _make_output(self, bom: 'Bom') -> str: if self._output_reproducible: bom.metadata.properties.add(Property(name=PropertyName.Reproducible.value, - value=PropertyName.BooleanTrue.value)) + value=PropertyValue.BooleanTrue.value)) # dirty hacks to remove these mandatory properties bom.serial_number = None # type:ignore[assignment] bom.metadata.timestamp = None # type:ignore[assignment] diff --git a/cyclonedx_py/_internal/environment.py b/cyclonedx_py/_internal/environment.py index 5b67ce10..469662e0 100644 --- a/cyclonedx_py/_internal/environment.py +++ b/cyclonedx_py/_internal/environment.py @@ -224,7 +224,7 @@ def __finalize_dependencies(self, bom: 'Bom', all_components: 'T_AllComponents') component_deps.append(req_component) req_component.properties.update( Property( - name=PropertyName.PackageExtra.value, + name=PropertyName.PythonPackageExtra.value, value=normalize_packagename(extra) ) for extra in req.extras ) @@ -236,16 +236,22 @@ def __component_add_extref_and_purl(self, component: 'Component', purl_subpath = None if packagesource is not None: if packagesource.subdirectory: - component.properties.add(Property(name=PropertyName.PackageSourceSubdirectory.value, + component.properties.add(Property(name=PropertyName.PythonPackageSourceSubdirectory.value, value=packagesource.subdirectory)) purl_subpath = packagesource.subdirectory if isinstance(packagesource, PackageSourceVcs): purl_qs['vcs_url'] = f'{packagesource.vcs}+{packagesource.url}@{packagesource.commit_id}' - component.properties.add(Property(name=PropertyName.PackageSourceVcsCommitId.value, + component.properties.add(Property(name=PropertyName.PythonPackageSourceVcsCommitId.value, value=packagesource.commit_id)) + component.properties.add(Property( + name=PropertyName.PoetryPackageSourceVcsCommitId.value, # deprecated + value=packagesource.commit_id)) if packagesource.requested_revision: - component.properties.add(Property(name=PropertyName.PackageSourceVcsRequestedRevision.value, + component.properties.add(Property(name=PropertyName.PythonPackageSourceVcsRequestedRevision.value, value=packagesource.requested_revision)) + component.properties.add(Property( + name=PropertyName.PoetryPackageSourceVcsRequestedRevision.value, # deprecated + value=packagesource.requested_revision)) elif isinstance(packagesource, PackageSourceArchive): if '://files.pythonhosted.org/' not in packagesource.url: # skip PURL bloat, do not add implicit information diff --git a/cyclonedx_py/_internal/pipenv.py b/cyclonedx_py/_internal/pipenv.py index b226c106..91cf397f 100644 --- a/cyclonedx_py/_internal/pipenv.py +++ b/cyclonedx_py/_internal/pipenv.py @@ -187,7 +187,7 @@ def _make_bom(self, root_c: Optional['Component'], )) component.properties.update( Property( - name=PropertyName.PackageExtra.value, + name=PropertyName.PythonPackageExtra.value, value=normalize_packagename(package_extra) ) for package_extra in package_data.get('extras', ()) ) diff --git a/cyclonedx_py/_internal/poetry.py b/cyclonedx_py/_internal/poetry.py index 81be8648..769c1db4 100644 --- a/cyclonedx_py/_internal/poetry.py +++ b/cyclonedx_py/_internal/poetry.py @@ -261,7 +261,7 @@ def _make_bom(self, project: 'T_NameDict', locker: 'T_NameDict', root_c.bom_ref.value = root_c.name root_c.properties.update( Property( - name=PropertyName.PackageExtra.value, + name=PropertyName.PythonPackageExtra.value, value=extra ) for extra in use_extras ) @@ -344,7 +344,7 @@ def __add_dep(self, bom: 'Bom', lock_entry: _LockEntry, use_extras: Iterable[str use_extras = frozenset(map(normalize_packagename, use_extras)) lock_entry.component.properties.update( Property( - name=PropertyName.PackageExtra.value, + name=PropertyName.PythonPackageExtra.value, value=extra ) for extra in use_extras ) diff --git a/cyclonedx_py/_internal/requirements.py b/cyclonedx_py/_internal/requirements.py index e3634a78..a9a78f1a 100644 --- a/cyclonedx_py/_internal/requirements.py +++ b/cyclonedx_py/_internal/requirements.py @@ -225,7 +225,7 @@ def _make_component(self, req: 'InstallRequirement', ) if not is_local and name else None, external_references=external_references, properties=(Property( - name=PropertyName.PackageExtra.value, + name=PropertyName.PythonPackageExtra.value, value=normalize_packagename(extra) ) for extra in req.extras) ) From bcdbf4daeb3088d1c6860fb73c4da97c35faa331 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 18 Sep 2024 19:30:53 +0200 Subject: [PATCH 2/7] tests Signed-off-by: Jan Kowalleck --- .../snapshots/environment/plain_with-urls_1.3.json.bin | 8 ++++++++ .../snapshots/environment/plain_with-urls_1.3.xml.bin | 2 ++ .../snapshots/environment/plain_with-urls_1.4.json.bin | 8 ++++++++ .../snapshots/environment/plain_with-urls_1.4.xml.bin | 2 ++ .../snapshots/environment/plain_with-urls_1.5.json.bin | 8 ++++++++ .../snapshots/environment/plain_with-urls_1.5.xml.bin | 2 ++ .../snapshots/environment/plain_with-urls_1.6.json.bin | 8 ++++++++ .../snapshots/environment/plain_with-urls_1.6.xml.bin | 2 ++ 8 files changed, 40 insertions(+) diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin index 8f0dfdf8..9429c24c 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin @@ -41,6 +41,14 @@ { "name": "cdx:poetry:package:source:vcs:requested_revision", "value": "23.2" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "23.2" } ], "purl": "pkg:pypi/packaging@23.2?vcs_url=git%2Bhttps://github.com/pypa/packaging.git%40b3a5d7d68991c040615d5345bb55f61de53ba176", diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin index aff81dc5..aed0badc 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin @@ -53,6 +53,8 @@ b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 + b3a5d7d68991c040615d5345bb55f61de53ba176 + 23.2 diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin index cd06c76a..e345e655 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin @@ -41,6 +41,14 @@ { "name": "cdx:poetry:package:source:vcs:requested_revision", "value": "23.2" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "23.2" } ], "purl": "pkg:pypi/packaging@23.2?vcs_url=git%2Bhttps://github.com/pypa/packaging.git%40b3a5d7d68991c040615d5345bb55f61de53ba176", diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin index f388a968..28b52284 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin @@ -80,6 +80,8 @@ b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 + b3a5d7d68991c040615d5345bb55f61de53ba176 + 23.2 diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin index ebef0b76..e9057aaf 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin @@ -41,6 +41,14 @@ { "name": "cdx:poetry:package:source:vcs:requested_revision", "value": "23.2" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "23.2" } ], "purl": "pkg:pypi/packaging@23.2?vcs_url=git%2Bhttps://github.com/pypa/packaging.git%40b3a5d7d68991c040615d5345bb55f61de53ba176", diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin index 413bef66..dda892d6 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin @@ -80,6 +80,8 @@ b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 + b3a5d7d68991c040615d5345bb55f61de53ba176 + 23.2 diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin index c7106498..26660354 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin @@ -43,6 +43,14 @@ { "name": "cdx:poetry:package:source:vcs:requested_revision", "value": "23.2" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "23.2" } ], "purl": "pkg:pypi/packaging@23.2?vcs_url=git%2Bhttps://github.com/pypa/packaging.git%40b3a5d7d68991c040615d5345bb55f61de53ba176", diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin index d79d1059..1b7efbd2 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin @@ -80,6 +80,8 @@ b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 + b3a5d7d68991c040615d5345bb55f61de53ba176 + 23.2 From 0329d6dde61c0de75ba4eb4bff40f4b7f132e145 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 18 Sep 2024 20:40:29 +0200 Subject: [PATCH 3/7] fix Signed-off-by: Jan Kowalleck --- cyclonedx_py/_internal/__init__.py | 5 ++-- cyclonedx_py/_internal/environment.py | 15 +++++++----- cyclonedx_py/_internal/poetry.py | 20 ++++++++++++---- ..._multi-constraint-deps_lock20_1.3.json.bin | 12 ++++++++++ ...n_multi-constraint-deps_lock20_1.3.xml.bin | 3 +++ ..._multi-constraint-deps_lock20_1.4.json.bin | 12 ++++++++++ ...n_multi-constraint-deps_lock20_1.4.xml.bin | 3 +++ ..._multi-constraint-deps_lock20_1.5.json.bin | 12 ++++++++++ ...n_multi-constraint-deps_lock20_1.5.xml.bin | 3 +++ ..._multi-constraint-deps_lock20_1.6.json.bin | 12 ++++++++++ ...n_multi-constraint-deps_lock20_1.6.xml.bin | 3 +++ .../plain_with-urls_lock10_1.3.json.bin | 16 +++++++++++++ .../poetry/plain_with-urls_lock10_1.3.xml.bin | 4 ++++ .../plain_with-urls_lock10_1.4.json.bin | 16 +++++++++++++ .../poetry/plain_with-urls_lock10_1.4.xml.bin | 4 ++++ .../plain_with-urls_lock10_1.5.json.bin | 16 +++++++++++++ .../poetry/plain_with-urls_lock10_1.5.xml.bin | 4 ++++ .../plain_with-urls_lock10_1.6.json.bin | 16 +++++++++++++ .../poetry/plain_with-urls_lock10_1.6.xml.bin | 4 ++++ .../plain_with-urls_lock11_1.3.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock11_1.3.xml.bin | 6 +++++ .../plain_with-urls_lock11_1.4.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock11_1.4.xml.bin | 6 +++++ .../plain_with-urls_lock11_1.5.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock11_1.5.xml.bin | 6 +++++ .../plain_with-urls_lock11_1.6.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock11_1.6.xml.bin | 6 +++++ .../plain_with-urls_lock20_1.3.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock20_1.3.xml.bin | 6 +++++ .../plain_with-urls_lock20_1.4.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock20_1.4.xml.bin | 6 +++++ .../plain_with-urls_lock20_1.5.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock20_1.5.xml.bin | 6 +++++ .../plain_with-urls_lock20_1.6.json.bin | 24 +++++++++++++++++++ .../poetry/plain_with-urls_lock20_1.6.xml.bin | 6 +++++ 35 files changed, 408 insertions(+), 12 deletions(-) diff --git a/cyclonedx_py/_internal/__init__.py b/cyclonedx_py/_internal/__init__.py index 7c6f2056..4cce63a0 100644 --- a/cyclonedx_py/_internal/__init__.py +++ b/cyclonedx_py/_internal/__init__.py @@ -71,10 +71,11 @@ class PropertyName(Enum): # region poetry # see https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/poetry.md PoetryGroup = 'cdx:poetry:group' - PoetryPackageSourceReference = 'cdx:poetry:source:package:reference' - PoetryPackageSourceResolvedReference = 'cdx:poetry:package:source:resolved_reference' # region poetry-deprecated # the following property names are deprecated + PoetryPackageSourceReference_misspelled = 'cdx:poetry:package:source:reference' + PoetryPackageSourceReference = 'cdx:poetry:source:package:reference' + PoetryPackageSourceResolvedReference = 'cdx:poetry:package:source:resolved_reference' PoetryPackageSourceVcsRequestedRevision = 'cdx:poetry:package:source:vcs:requested_revision' PoetryPackageSourceVcsCommitId = 'cdx:poetry:package:source:vcs:commit_id' # endregion poetry-deprecated diff --git a/cyclonedx_py/_internal/environment.py b/cyclonedx_py/_internal/environment.py index 469662e0..abc13b00 100644 --- a/cyclonedx_py/_internal/environment.py +++ b/cyclonedx_py/_internal/environment.py @@ -236,19 +236,22 @@ def __component_add_extref_and_purl(self, component: 'Component', purl_subpath = None if packagesource is not None: if packagesource.subdirectory: - component.properties.add(Property(name=PropertyName.PythonPackageSourceSubdirectory.value, - value=packagesource.subdirectory)) + component.properties.add(Property( + name=PropertyName.PythonPackageSourceSubdirectory.value, + value=packagesource.subdirectory)) purl_subpath = packagesource.subdirectory if isinstance(packagesource, PackageSourceVcs): purl_qs['vcs_url'] = f'{packagesource.vcs}+{packagesource.url}@{packagesource.commit_id}' - component.properties.add(Property(name=PropertyName.PythonPackageSourceVcsCommitId.value, - value=packagesource.commit_id)) + component.properties.add(Property( + name=PropertyName.PythonPackageSourceVcsCommitId.value, + value=packagesource.commit_id)) component.properties.add(Property( name=PropertyName.PoetryPackageSourceVcsCommitId.value, # deprecated value=packagesource.commit_id)) if packagesource.requested_revision: - component.properties.add(Property(name=PropertyName.PythonPackageSourceVcsRequestedRevision.value, - value=packagesource.requested_revision)) + component.properties.add(Property( + name=PropertyName.PythonPackageSourceVcsRequestedRevision.value, + value=packagesource.requested_revision)) component.properties.add(Property( name=PropertyName.PoetryPackageSourceVcsRequestedRevision.value, # deprecated value=packagesource.requested_revision)) diff --git a/cyclonedx_py/_internal/poetry.py b/cyclonedx_py/_internal/poetry.py index 769c1db4..b381095c 100644 --- a/cyclonedx_py/_internal/poetry.py +++ b/cyclonedx_py/_internal/poetry.py @@ -403,20 +403,32 @@ def __make_component4lock(self, package: 'T_NameDict') -> 'Component': description=package.get('description'), scope=ComponentScope.OPTIONAL if package.get('optional') else None, external_references=self.__extrefs4lock(package), - properties=filter(lambda p: p and p.value, [ # type: ignore[arg-type] + properties=filter(lambda p: p and p.value, ( # type: ignore[arg-type] + Property( + name=PropertyName.PythonPackageSourceVcsRequestedRevision.value, + value=source['reference'] + ) if is_vcs and 'reference' in source else None, + Property( + name=PropertyName.PythonPackageSourceVcsCommitId.value, + value=source['resolved_reference'] + ) if is_vcs and 'resolved_reference' in source else None, Property( # for backwards compatibility: category -> group name=PropertyName.PoetryGroup.value, value=package['category'] ) if 'category' in package else None, Property( - name=PropertyName.PoetryPackageSourceReference.value, + name=PropertyName.PoetryPackageSourceReference_misspelled.value, # deprecated + value=source['reference'] + ) if is_vcs and 'reference' in source else None, + Property( + name=PropertyName.PoetryPackageSourceReference.value, # deprecated value=source['reference'] ) if is_vcs and 'reference' in source else None, Property( - name=PropertyName.PoetryPackageSourceResolvedReference.value, + name=PropertyName.PoetryPackageSourceResolvedReference.value, # deprecated value=source['resolved_reference'] ) if is_vcs and 'resolved_reference' in source else None, - ]), + )), purl=PackageURL( type=PurlTypePypi, name=package['name'], diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin index 0c50abfe..723dad3d 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "2.3.5" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "2.3.5" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "2.3.5" } ], "purl": "pkg:pypi/pathlib2@2.3.5?vcs_url=git%2Bhttps://github.com/jazzband/pathlib2.git%405a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6", diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin index adc951da..47f526aa 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin @@ -36,8 +36,11 @@ main + 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 + 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 + 2.3.5 diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin index 20cedb8e..3ad83cc8 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "2.3.5" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "2.3.5" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "2.3.5" } ], "purl": "pkg:pypi/pathlib2@2.3.5?vcs_url=git%2Bhttps://github.com/jazzband/pathlib2.git%405a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6", diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin index b54a5a71..2f5ecb38 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin @@ -63,8 +63,11 @@ main + 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 + 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 + 2.3.5 diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin index 6deee8fb..c4959916 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "2.3.5" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "2.3.5" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "2.3.5" } ], "purl": "pkg:pypi/pathlib2@2.3.5?vcs_url=git%2Bhttps://github.com/jazzband/pathlib2.git%405a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6", diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin index 615e5089..b3a54d0d 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin @@ -63,8 +63,11 @@ main + 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 + 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 + 2.3.5 diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin index 8cc093c4..04b22445 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "2.3.5" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "2.3.5" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "2.3.5" } ], "purl": "pkg:pypi/pathlib2@2.3.5?vcs_url=git%2Bhttps://github.com/jazzband/pathlib2.git%405a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6", diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin index 4bddb967..2505f0f9 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin @@ -63,8 +63,11 @@ main + 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 + 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 + 2.3.5 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin index 14c3ba63..9a5dc841 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin @@ -16,9 +16,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -62,9 +70,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin index 28c2d00e..4316bbc1 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin @@ -36,7 +36,9 @@ main + da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c + da59ad000d1405eaecd557175e29083a87d19f7c @@ -67,7 +69,9 @@ main + 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 + 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin index 5a0767f9..58f71edf 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin @@ -16,9 +16,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -62,9 +70,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin index 7cea5129..724c9403 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin @@ -63,7 +63,9 @@ main + da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c + da59ad000d1405eaecd557175e29083a87d19f7c @@ -94,7 +96,9 @@ main + 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 + 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin index ef00a489..07ed69f5 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin @@ -16,9 +16,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -62,9 +70,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin index 05f94424..0516bd56 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin @@ -63,7 +63,9 @@ main + da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c + da59ad000d1405eaecd557175e29083a87d19f7c @@ -94,7 +96,9 @@ main + 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 + 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin index 026a2175..da726fb9 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin @@ -16,9 +16,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -62,9 +70,17 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin index db2ede0d..3f8fa28e 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin @@ -63,7 +63,9 @@ main + da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c + da59ad000d1405eaecd557175e29083a87d19f7c @@ -94,7 +96,9 @@ main + 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 + 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin index b4d0630d..2221af1e 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -66,6 +78,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -73,6 +89,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin index ad79f909..159a5f25 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin @@ -36,8 +36,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -68,8 +71,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin index daadddcc..4aac7964 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -66,6 +78,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -73,6 +89,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin index 7e01c20b..349c1aa1 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin @@ -63,8 +63,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -95,8 +98,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin index 1a98f44c..fb993923 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -66,6 +78,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -73,6 +89,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin index 076add61..7422f709 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin @@ -63,8 +63,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -95,8 +98,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin index e9861358..ba975013 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -66,6 +78,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -73,6 +89,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin index 6aca0bec..671f8d67 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin @@ -63,8 +63,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -95,8 +98,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin index 4b7970f5..0f6700de 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -72,6 +84,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -79,6 +95,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin index 530aa048..9dd78c40 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin @@ -36,8 +36,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -71,8 +74,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin index 9d6e60d9..9041046f 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -72,6 +84,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -79,6 +95,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin index 702b929e..1a973a4e 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin @@ -63,8 +63,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -98,8 +101,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin index a90489ee..c2d87572 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -72,6 +84,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -79,6 +95,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin index 8893d1ae..f802864f 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin @@ -63,8 +63,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -98,8 +101,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin index 67a67137..11932847 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin @@ -16,6 +16,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "10.1.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -23,6 +27,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "10.1.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "da59ad000d1405eaecd557175e29083a87d19f7c" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "10.1.0" } ], "purl": "pkg:pypi/pillow@10.1.0?vcs_url=git%2Bhttps://github.com/python-pillow/Pillow.git%40da59ad000d1405eaecd557175e29083a87d19f7c", @@ -72,6 +84,10 @@ "name": "cdx:poetry:group", "value": "main" }, + { + "name": "cdx:poetry:package:source:reference", + "value": "1.16.0" + }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" @@ -79,6 +95,14 @@ { "name": "cdx:poetry:source:package:reference", "value": "1.16.0" + }, + { + "name": "cdx:python:package:source:vcs:commit_id", + "value": "65486e4383f9f411da95937451205d3c7b61b9e1" + }, + { + "name": "cdx:python:package:source:vcs:requested_revision", + "value": "1.16.0" } ], "purl": "pkg:pypi/six@1.16.0?vcs_url=git%2Bssh://git%40github.com/benjaminp/six.git%4065486e4383f9f411da95937451205d3c7b61b9e1", diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin index 44d5bfe7..1d4e876a 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin @@ -63,8 +63,11 @@ main + 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 + da59ad000d1405eaecd557175e29083a87d19f7c + 10.1.0 @@ -98,8 +101,11 @@ main + 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 + 65486e4383f9f411da95937451205d3c7b61b9e1 + 1.16.0 From 485dfd8cdaa89adcfe4f6cb2a57d69e9b2932af8 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 18 Sep 2024 20:45:49 +0200 Subject: [PATCH 4/7] comments Signed-off-by: Jan Kowalleck --- cyclonedx_py/_internal/poetry.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cyclonedx_py/_internal/poetry.py b/cyclonedx_py/_internal/poetry.py index b381095c..97587746 100644 --- a/cyclonedx_py/_internal/poetry.py +++ b/cyclonedx_py/_internal/poetry.py @@ -416,6 +416,7 @@ def __make_component4lock(self, package: 'T_NameDict') -> 'Component': name=PropertyName.PoetryGroup.value, value=package['category'] ) if 'category' in package else None, + # region deprecated Property( name=PropertyName.PoetryPackageSourceReference_misspelled.value, # deprecated value=source['reference'] @@ -428,6 +429,7 @@ def __make_component4lock(self, package: 'T_NameDict') -> 'Component': name=PropertyName.PoetryPackageSourceResolvedReference.value, # deprecated value=source['resolved_reference'] ) if is_vcs and 'resolved_reference' in source else None, + # endregion deprecated )), purl=PackageURL( type=PurlTypePypi, From 8b6126ef34cf2612cde888381d80f9bc53205f48 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 18 Sep 2024 21:13:12 +0200 Subject: [PATCH 5/7] dings Signed-off-by: Jan Kowalleck --- cyclonedx_py/_internal/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cyclonedx_py/_internal/__init__.py b/cyclonedx_py/_internal/__init__.py index 4cce63a0..834d2d97 100644 --- a/cyclonedx_py/_internal/__init__.py +++ b/cyclonedx_py/_internal/__init__.py @@ -73,8 +73,8 @@ class PropertyName(Enum): PoetryGroup = 'cdx:poetry:group' # region poetry-deprecated # the following property names are deprecated - PoetryPackageSourceReference_misspelled = 'cdx:poetry:package:source:reference' - PoetryPackageSourceReference = 'cdx:poetry:source:package:reference' + PoetryPackageSourceReference_misspelled = 'cdx:poetry:source:package:reference' + PoetryPackageSourceReference = 'cdx:poetry:package:source:reference' PoetryPackageSourceResolvedReference = 'cdx:poetry:package:source:resolved_reference' PoetryPackageSourceVcsRequestedRevision = 'cdx:poetry:package:source:vcs:requested_revision' PoetryPackageSourceVcsCommitId = 'cdx:poetry:package:source:vcs:commit_id' From 5a4fb7886b4f3381d517f2f9a11a5c032bea2d82 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 18 Sep 2024 21:16:43 +0200 Subject: [PATCH 6/7] dings Signed-off-by: Jan Kowalleck --- cyclonedx_py/_internal/__init__.py | 1 - cyclonedx_py/_internal/poetry.py | 4 ---- .../plain_multi-constraint-deps_lock20_1.3.json.bin | 4 ---- .../poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin | 1 - .../plain_multi-constraint-deps_lock20_1.4.json.bin | 4 ---- .../poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin | 1 - .../plain_multi-constraint-deps_lock20_1.5.json.bin | 4 ---- .../poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin | 1 - .../plain_multi-constraint-deps_lock20_1.6.json.bin | 4 ---- .../poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin | 1 - .../snapshots/poetry/plain_with-urls_lock10_1.3.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock10_1.4.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock10_1.5.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock10_1.6.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock11_1.3.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock11_1.4.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock11_1.5.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock11_1.6.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock20_1.3.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock20_1.4.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock20_1.5.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin | 2 -- .../snapshots/poetry/plain_with-urls_lock20_1.6.json.bin | 8 -------- .../snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin | 2 -- 34 files changed, 145 deletions(-) diff --git a/cyclonedx_py/_internal/__init__.py b/cyclonedx_py/_internal/__init__.py index 834d2d97..06911888 100644 --- a/cyclonedx_py/_internal/__init__.py +++ b/cyclonedx_py/_internal/__init__.py @@ -74,7 +74,6 @@ class PropertyName(Enum): # region poetry-deprecated # the following property names are deprecated PoetryPackageSourceReference_misspelled = 'cdx:poetry:source:package:reference' - PoetryPackageSourceReference = 'cdx:poetry:package:source:reference' PoetryPackageSourceResolvedReference = 'cdx:poetry:package:source:resolved_reference' PoetryPackageSourceVcsRequestedRevision = 'cdx:poetry:package:source:vcs:requested_revision' PoetryPackageSourceVcsCommitId = 'cdx:poetry:package:source:vcs:commit_id' diff --git a/cyclonedx_py/_internal/poetry.py b/cyclonedx_py/_internal/poetry.py index 97587746..36d13b6a 100644 --- a/cyclonedx_py/_internal/poetry.py +++ b/cyclonedx_py/_internal/poetry.py @@ -421,10 +421,6 @@ def __make_component4lock(self, package: 'T_NameDict') -> 'Component': name=PropertyName.PoetryPackageSourceReference_misspelled.value, # deprecated value=source['reference'] ) if is_vcs and 'reference' in source else None, - Property( - name=PropertyName.PoetryPackageSourceReference.value, # deprecated - value=source['reference'] - ) if is_vcs and 'reference' in source else None, Property( name=PropertyName.PoetryPackageSourceResolvedReference.value, # deprecated value=source['resolved_reference'] diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin index 723dad3d..7884c176 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "2.3.5" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin index 47f526aa..24a86ce4 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.3.xml.bin @@ -36,7 +36,6 @@ main - 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin index 3ad83cc8..54833efe 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "2.3.5" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin index 2f5ecb38..31f531ee 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.4.xml.bin @@ -63,7 +63,6 @@ main - 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin index c4959916..9dd944e9 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "2.3.5" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin index b3a54d0d..d8b53908 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.5.xml.bin @@ -63,7 +63,6 @@ main - 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin index 04b22445..3587e51e 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "2.3.5" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6" diff --git a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin index 2505f0f9..466fdce6 100644 --- a/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_multi-constraint-deps_lock20_1.6.xml.bin @@ -63,7 +63,6 @@ main - 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 2.3.5 5a6a88db3cc1d08dbc86fbe15edfb69fb5f5a3d6 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin index 9a5dc841..125fbde1 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "da59ad000d1405eaecd557175e29083a87d19f7c" - }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -70,10 +66,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "65486e4383f9f411da95937451205d3c7b61b9e1" - }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin index 4316bbc1..738b0549 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.3.xml.bin @@ -36,7 +36,6 @@ main - da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c @@ -69,7 +68,6 @@ main - 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin index 58f71edf..4733e13e 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "da59ad000d1405eaecd557175e29083a87d19f7c" - }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -70,10 +66,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "65486e4383f9f411da95937451205d3c7b61b9e1" - }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin index 724c9403..8d3f34c1 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.4.xml.bin @@ -63,7 +63,6 @@ main - da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c @@ -96,7 +95,6 @@ main - 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin index 07ed69f5..0df8c5a0 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "da59ad000d1405eaecd557175e29083a87d19f7c" - }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -70,10 +66,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "65486e4383f9f411da95937451205d3c7b61b9e1" - }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin index 0516bd56..417afd85 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.5.xml.bin @@ -63,7 +63,6 @@ main - da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c @@ -96,7 +95,6 @@ main - 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin index da726fb9..275a833b 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "da59ad000d1405eaecd557175e29083a87d19f7c" - }, { "name": "cdx:poetry:source:package:reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -70,10 +66,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "65486e4383f9f411da95937451205d3c7b61b9e1" - }, { "name": "cdx:poetry:source:package:reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin index 3f8fa28e..7a1cc909 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock10_1.6.xml.bin @@ -63,7 +63,6 @@ main - da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c da59ad000d1405eaecd557175e29083a87d19f7c @@ -96,7 +95,6 @@ main - 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin index 2221af1e..6a45b5ae 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -78,10 +74,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin index 159a5f25..6c701dad 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.3.xml.bin @@ -36,7 +36,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -71,7 +70,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin index 4aac7964..871ac352 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -78,10 +74,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin index 349c1aa1..16fdcdcb 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.4.xml.bin @@ -63,7 +63,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -98,7 +97,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin index fb993923..740d9bff 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -78,10 +74,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin index 7422f709..418b550c 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.5.xml.bin @@ -63,7 +63,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -98,7 +97,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin index ba975013..ee1e498f 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -78,10 +74,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin index 671f8d67..01b7a02c 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock11_1.6.xml.bin @@ -63,7 +63,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -98,7 +97,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin index 0f6700de..27573afa 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -84,10 +80,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin index 9dd78c40..c9c5d25b 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.3.xml.bin @@ -36,7 +36,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -74,7 +73,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin index 9041046f..cfbf70af 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -84,10 +80,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin index 1a973a4e..25ac8f04 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.4.xml.bin @@ -63,7 +63,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -101,7 +100,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin index c2d87572..779461c8 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -84,10 +80,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin index f802864f..27c7ec1c 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.5.xml.bin @@ -63,7 +63,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -101,7 +100,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin index 11932847..e354ffa7 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.json.bin @@ -16,10 +16,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "10.1.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "da59ad000d1405eaecd557175e29083a87d19f7c" @@ -84,10 +80,6 @@ "name": "cdx:poetry:group", "value": "main" }, - { - "name": "cdx:poetry:package:source:reference", - "value": "1.16.0" - }, { "name": "cdx:poetry:package:source:resolved_reference", "value": "65486e4383f9f411da95937451205d3c7b61b9e1" diff --git a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin index 1d4e876a..3cb13878 100644 --- a/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/plain_with-urls_lock20_1.6.xml.bin @@ -63,7 +63,6 @@ main - 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c 10.1.0 da59ad000d1405eaecd557175e29083a87d19f7c @@ -101,7 +100,6 @@ main - 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 1.16.0 65486e4383f9f411da95937451205d3c7b61b9e1 From 55e9e25f307e164c5c9debd06bc2d1a5832f5a29 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 18 Sep 2024 21:19:49 +0200 Subject: [PATCH 7/7] tidy Signed-off-by: Jan Kowalleck --- cyclonedx_py/_internal/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cyclonedx_py/_internal/__init__.py b/cyclonedx_py/_internal/__init__.py index 06911888..d718f27b 100644 --- a/cyclonedx_py/_internal/__init__.py +++ b/cyclonedx_py/_internal/__init__.py @@ -73,7 +73,7 @@ class PropertyName(Enum): PoetryGroup = 'cdx:poetry:group' # region poetry-deprecated # the following property names are deprecated - PoetryPackageSourceReference_misspelled = 'cdx:poetry:source:package:reference' + PoetryPackageSourceReference_misspelled = 'cdx:poetry:source:package:reference' PoetryPackageSourceResolvedReference = 'cdx:poetry:package:source:resolved_reference' PoetryPackageSourceVcsRequestedRevision = 'cdx:poetry:package:source:vcs:requested_revision' PoetryPackageSourceVcsCommitId = 'cdx:poetry:package:source:vcs:commit_id'