Skip to content

Commit e256925

Browse files
authored
Merge branch 'main' into issue_868
2 parents 6e168f0 + 880dd79 commit e256925

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/python.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,24 @@ jobs:
162162
matrix:
163163
os:
164164
- ubuntu-latest
165-
- macos-13 # macos-latest might be incompatible to py38 - see https://github.com/CycloneDX/cyclonedx-python-lib/pull/599#issuecomment-2077462142
165+
- macos-latest
166166
- windows-latest
167167
python-version:
168168
- "3.13" # highest supported
169169
- "3.12"
170170
- "3.11"
171171
- "3.10"
172172
- "3.9" # lowest supported -- handled in include
173+
exclude:
174+
- os: macos-latest
175+
python-version: "3.10"
176+
- os: macos-latest
177+
python-version: "3.9"
178+
include:
179+
- os: macos-13
180+
python-version: "3.10"
181+
- os: macos-13
182+
python-version: "3.9"
173183
steps:
174184
- name: Checkout
175185
# see https://github.com/actions/checkout

cyclonedx_py/_internal/cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def make_argument_parser(cls, sco: ArgumentParser, **kwargs: Any) -> ArgumentPar
7474
dest='spec_version',
7575
choices=SchemaVersion,
7676
type=SchemaVersion.from_version,
77-
default=SchemaVersion.V1_5.to_version())
77+
default=SchemaVersion.V1_6.to_version())
7878
op.add_argument('--sv', '--spec-version',
7979
metavar='<version>',
8080
help='Which version of CycloneDX to use.'
@@ -83,7 +83,7 @@ def make_argument_parser(cls, sco: ArgumentParser, **kwargs: Any) -> ArgumentPar
8383
dest='spec_version',
8484
choices=SchemaVersion,
8585
type=SchemaVersion.from_version,
86-
default=SchemaVersion.V1_5.to_version())
86+
default=SchemaVersion.V1_6.to_version())
8787
op.add_argument('--output-reproducible',
8888
help='Whether to go the extra mile and make the output reproducible.\n'
8989
'This might result in loss of time- and random-based values.',

0 commit comments

Comments
 (0)