Skip to content

Commit babaa45

Browse files
authored
Merge branch 'main' into main
2 parents 361f7a7 + 27b2d43 commit babaa45

12 files changed

Lines changed: 113 additions & 29 deletions

File tree

‎.github/workflows/python.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
steps:
3434
- name: Checkout
3535
# see https://github.com/actions/checkout
36-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
36+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3737
with:
3838
persist-credentials: false
3939
- name: Setup Python Environment
4040
# see https://github.com/actions/setup-python
41-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
41+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
4242
with:
4343
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
4444
architecture: 'x64'
@@ -59,12 +59,12 @@ jobs:
5959
steps:
6060
- name: Checkout
6161
# see https://github.com/actions/checkout
62-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
62+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6363
with:
6464
persist-credentials: false
6565
- name: Setup Python Environment
6666
# see https://github.com/actions/setup-python
67-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
67+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
6868
with:
6969
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
7070
architecture: 'x64'
@@ -85,12 +85,12 @@ jobs:
8585
steps:
8686
- name: Checkout
8787
# see https://github.com/actions/checkout
88-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
88+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
8989
with:
9090
persist-credentials: false
9191
- name: Setup Python Environment
9292
# see https://github.com/actions/setup-python
93-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
93+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
9494
with:
9595
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
9696
architecture: 'x64'
@@ -111,12 +111,12 @@ jobs:
111111
steps:
112112
- name: Checkout
113113
# see https://github.com/actions/checkout
114-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
114+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
115115
with:
116116
persist-credentials: false
117117
- name: Setup Python Environment
118118
# see https://github.com/actions/setup-python
119-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
119+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
120120
with:
121121
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
122122
architecture: 'x64'
@@ -149,12 +149,12 @@ jobs:
149149
steps:
150150
- name: Checkout
151151
# see https://github.com/actions/checkout
152-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
152+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
153153
with:
154154
persist-credentials: false
155155
- name: Setup Python Environment
156156
# see https://github.com/actions/setup-python
157-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
157+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
158158
with:
159159
python-version: ${{ matrix.python-version }}
160160
architecture: 'x64'
@@ -201,14 +201,14 @@ jobs:
201201
git config --global core.eol lf
202202
- name: Checkout
203203
# see https://github.com/actions/checkout
204-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
204+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
205205
with:
206206
persist-credentials: false
207207
- name: Create reports directory
208208
run: mkdir ${{ env.REPORTS_DIR }}
209209
- name: Setup Python Environment
210210
# see https://github.com/actions/setup-python
211-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
211+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
212212
with:
213213
python-version: ${{ matrix.python-version }}
214214
architecture: 'x64'
@@ -281,12 +281,12 @@ jobs:
281281
steps:
282282
- name: Checkout
283283
# see https://github.com/actions/checkout
284-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
284+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
285285
with:
286286
persist-credentials: false
287287
- name: Setup Python Environment
288288
# see https://github.com/actions/setup-python
289-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
289+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
290290
with:
291291
python-version: '>=3.9 <=3.14' # supported version range
292292
- name: Validate Python Environment

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
steps:
4949
- name: Checkout code
5050
# see https://github.com/actions/checkout
51-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
51+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5252
with:
5353
persist-credentials: false
5454
- name: Setup Python Environment
5555
# see https://github.com/actions/setup-python
56-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
56+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
5757
with:
5858
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
5959
architecture: 'x64'
@@ -72,12 +72,12 @@ jobs:
7272
steps:
7373
- name: Checkout code
7474
# see https://github.com/actions/checkout
75-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
75+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7676
with:
7777
persist-credentials: false
7878
- name: Setup Python Environment
7979
# see https://github.com/actions/setup-python
80-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
80+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
8181
with:
8282
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
8383
architecture: 'x64'
@@ -126,15 +126,15 @@ jobs:
126126

127127
- name: Checkout code
128128
# see https://github.com/actions/checkout
129-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
129+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
130130
with:
131131
fetch-depth: 0
132132
token: ${{ steps.release-bot-token.outputs.token }}
133133
persist-credentials: false
134134

135135
- name: Setup python
136136
# see https://github.com/actions/setup-python
137-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
137+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
138138
with:
139139
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
140140
architecture: 'x64'
@@ -167,7 +167,7 @@ jobs:
167167
- name: Publish package distributions to PyPI
168168
if: steps.release.outputs.released == 'true'
169169
# see https://github.com/pypa/gh-action-pypi-publish
170-
uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
170+
uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
171171
with:
172172
attestations: true
173173

‎.github/workflows/zizmor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
steps:
2828
- name: Checkout
2929
# see https://github.com/actions/checkout
30-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
30+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3131
with:
3232
persist-credentials: false
3333
- name: Run zizmor 🌈
3434
# see https://github.com/zizmorcore/zizmor-action
35-
uses: zizmorcore/zizmor-action@6599ee8b7a49aef6a770f63d261d214911a7ce02 # v0.6.0
35+
uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2
3636
with:
3737
# advanced-security: false => emit findings as workflow-command annotations (::error file=…) rather than
3838
# uploading a SARIF report to GitHub's Security tab.

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
<!-- version list -->
44

5+
## v11.11.2 (2026-08-12)
6+
7+
### Bug Fixes
8+
9+
- Encode paths when loading XML schemas
10+
([#1028](https://github.com/CycloneDX/cyclonedx-python-lib/pull/1028),
11+
[`17a0136`](https://github.com/CycloneDX/cyclonedx-python-lib/commit/17a0136138ceca96383f484f158f5d4de414a9ec))
12+
13+
14+
## v11.11.1 (2026-08-10)
15+
16+
### Bug Fixes
17+
18+
- Comparablepackageurl includes `name`
19+
([#1022](https://github.com/CycloneDX/cyclonedx-python-lib/pull/1022),
20+
[`d718ac2`](https://github.com/CycloneDX/cyclonedx-python-lib/commit/d718ac2391095851e6e5e2e75988e7dfb79494a4))
21+
22+
523
## v11.11.0 (2026-06-17)
624

725
### Bug Fixes

‎cyclonedx/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
# !! version is managed by semantic_release
2424
# do not use typing here, or else `semantic_release` might have issues finding the variable
25-
__version__ = "11.11.0" # noqa:Q000
25+
__version__ = "11.11.2" # noqa:Q000

‎cyclonedx/_internal/compare.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ def __new__(cls, p: 'PackageURL') -> 'ComparablePackageURL':
7676
return super().__new__(cls, (
7777
p.type,
7878
p.namespace,
79+
p.name,
7980
p.version,
8081
ComparableDict(p.qualifiers) if isinstance(p.qualifiers, dict) else p.qualifiers,
8182
p.subpath

‎cyclonedx/validation/xml.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
from abc import ABC
2222
from collections.abc import Iterable
23+
from pathlib import Path
2324
from typing import TYPE_CHECKING, Literal, Optional, Union, overload
2425

2526
from ..exception import MissingOptionalDependencyException
@@ -125,7 +126,7 @@ def _validator(self) -> 'XMLSchema':
125126
schema_file = self._schema_file
126127
if schema_file is None:
127128
raise NotImplementedError('missing schema file')
128-
self.__validator = XMLSchema(file=schema_file)
129+
self.__validator = XMLSchema(file=Path(schema_file).absolute().as_uri())
129130
return self.__validator
130131

131132

‎docs/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
# The full version, including alpha/beta/rc tags
2525
# !! version is managed by semantic_release
26-
release = '11.11.0'
26+
release = '11.11.2'
2727

2828
# -- General configuration ---------------------------------------------------
2929

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
55
[tool.poetry]
66
name = "cyclonedx-python-lib"
77
# !! version is managed by semantic_release
8-
version = "11.11.0"
8+
version = "11.11.2"
99
description = "Python library for CycloneDX"
1010
authors = [
1111
"Paul Horton <[email protected]>",
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# This file is part of CycloneDX Python Library
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
# SPDX-License-Identifier: Apache-2.0
16+
# Copyright (c) OWASP Foundation. All Rights Reserved.
17+
18+
from unittest import TestCase
19+
20+
from packageurl import PackageURL
21+
22+
from cyclonedx._internal.compare import ComparablePackageURL
23+
24+
25+
class TestComparablePackageURL(TestCase):
26+
27+
def test_differs_by_name(self) -> None:
28+
"""
29+
regression for https://github.com/CycloneDX/cyclonedx-python-lib/issues/1021
30+
31+
name was missing from the comparison tuple, so two purls that differ
32+
only by name compared equal
33+
"""
34+
purl1 = ComparablePackageURL(PackageURL(type='pypi', name='foo', version='1.0.0'))
35+
purl2 = ComparablePackageURL(PackageURL(type='pypi', name='bar', version='1.0.0'))
36+
self.assertNotEqual(purl1, purl2)
37+
self.assertGreater(purl1, purl2)
38+
self.assertLess(purl2, purl1)
39+
40+
def test_equal_same_purl(self) -> None:
41+
purl1 = ComparablePackageURL(PackageURL(type='pypi', name='foo', version='1.0.0'))
42+
purl2 = ComparablePackageURL(PackageURL(type='pypi', name='foo', version='1.0.0'))
43+
self.assertEqual(purl1, purl2)

0 commit comments

Comments
 (0)