Skip to content

Commit a4596c8

Browse files
authored
ci: fix run with lowest compat dependencies (#240)
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 3d011ab commit a4596c8

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/poetry.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install dependencies
4242
run: poetry install --no-root
4343
- name: Run tox
44-
run: poetry run tox -e flake8
44+
run: poetry run tox -e flake8 -s false
4545

4646
static-code-analysis:
4747
name: StaticCodingAnalysis (py${{ matrix.python-version}} ${{ matrix.toxenv-factor }})
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install dependencies
7676
run: poetry install --no-root
7777
- name: Run tox
78-
run: poetry run tox -e mypy-${{ matrix.toxenv-factor }}
78+
run: poetry run tox -e mypy-${{ matrix.toxenv-factor }} -s false
7979

8080
build-and-test:
8181
name: Test (${{ matrix.os }} py${{ matrix.python-version }} ${{ matrix.toxenv-factor }})
@@ -98,7 +98,7 @@ jobs:
9898
- # test with the lowest dependencies
9999
os: 'ubuntu-latest'
100100
python-version: '3.6'
101-
toxenv: 'lowest'
101+
toxenv-factor: 'lowest'
102102
steps:
103103
- name: Disabled Git auto EOL CRLF transforms
104104
run: |
@@ -131,7 +131,7 @@ jobs:
131131
- name: Generate coverage reports
132132
run: >
133133
poetry run coverage report &&
134-
poetry run coverage xml -o ${{ env.REPORTS_DIR }}/coverage-${{ matrix.os }}-${{ matrix.python-version }}.xml &&
134+
poetry run coverage xml -o ${{ env.REPORTS_DIR }}/coverage-${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.toxenv-factor }}.xml &&
135135
poetry run coverage html -d ${{ env.REPORTS_DIR }}
136136
- name: Artifact reports
137137
if: ${{ ! cancelled() }}

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ keywords = [
4444
# ATTENTION: keep `requirements.lowest.txt` file in sync
4545
python = "^3.6"
4646
packageurl-python = ">= 0.9"
47-
setuptools = ">= 47.0.0"
4847
importlib-metadata = { version = ">= 3.4", python = "< 3.8" }
48+
setuptools = ">= 47.0.0"
4949
toml = "^0.10.0"
5050

5151
[tool.poetry.dev-dependencies]

requirements.lowest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# see pyptoject file for ranges
33

44
packageurl-python == 0.9.0
5-
setuptools == 47.0.0
65
importlib-metadata == 3.4.0 # ; python_version < '3.8'
6+
setuptools == 47.0.0
7+
types-setuptools == 57.0.0
78
toml == 0.10.0
8-
types-setuptools == 57.4.17
99
types-toml == 0.10.0

tests/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
if sys.version_info >= (3, 7):
3838
from jsonschema import ValidationError, validate as json_validate
3939

40-
if sys.version_info >= (3, 8, 0):
40+
if sys.version_info >= (3, 8):
4141
from importlib.metadata import version
4242
else:
43-
from importlib_metadata import version # type: ignore
43+
from importlib_metadata import version
4444

4545
cyclonedx_lib_name: str = 'cyclonedx-python-lib'
4646
cyclonedx_lib_version: str = version(cyclonedx_lib_name)

0 commit comments

Comments
 (0)