Skip to content

Commit f0be248

Browse files
authored
Merge branch 'master' into allure-step-type-hint
2 parents b496a30 + 4198940 commit f0be248

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

.github/workflows/build.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
- allure-python-commons-test/**
2323
- tests/*.py
2424
- tests/allure_pytest/**
25+
- .github/workflows/build.yaml
2526
other-changes:
2627
name: Collect file changes other than allure-pytest
2728
runs-on: ubuntu-latest
@@ -38,26 +39,34 @@ jobs:
3839
- allure-python-commons-test/**
3940
- tests/*.py
4041
- tests/allure_behave/**
42+
- .github/workflows/build.yaml
4143
allure-nose2:
4244
- allure-nose2/**
4345
- allure-python-commons/**
4446
- allure-python-commons-test/**
4547
- tests/*.py
4648
- tests/allure_nose2/**
49+
- .github/workflows/build.yaml
4750
allure-pytest-bdd:
4851
- allure-pytest-bdd/**
4952
- allure-python-commons/**
5053
- allure-python-commons-test/**
5154
- tests/*.py
5255
- tests/allure_pytest_bdd/**
56+
- .github/workflows/build.yaml
5357
allure-robotframework:
5458
- allure-robotframework/**
5559
- allure-python-commons/**
5660
- allure-python-commons-test/**
5761
- tests/*.py
5862
- tests/allure_robotframework/**
59-
allure-python-commons: allure-python-commons/**
60-
allure-python-commons-test: allure-python-commons-test/**
63+
- .github/workflows/build.yaml
64+
allure-python-commons:
65+
- allure-python-commons/**
66+
- .github/workflows/build.yaml
67+
allure-python-commons-test:
68+
- allure-python-commons-test/**
69+
- .github/workflows/build.yaml
6170
6271
lint:
6372
name: Static check
@@ -70,7 +79,7 @@ jobs:
7079
- name: Set up Python
7180
uses: actions/setup-python@v5
7281
with:
73-
python-version: "3.12"
82+
python-version: "3.13"
7483

7584
- name: Install linting packages
7685
run: pip install -r ./requirements/linting.txt
@@ -85,11 +94,8 @@ jobs:
8594
if: ${{ needs.pytest-changes.outputs.changed == 'true' }}
8695
strategy:
8796
matrix:
88-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
97+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
8998
pytest-version: ["7.*", "8.*"]
90-
exclude:
91-
- python-version: "3.7"
92-
pytest-version: "8.*"
9399
env:
94100
TEST_TMP: /tmp
95101
ALLURE_INDENT_OUTPUT: yep
@@ -122,7 +128,7 @@ jobs:
122128
strategy:
123129
matrix:
124130
package: ${{ fromJSON(needs.other-changes.outputs.packages) }}
125-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
131+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
126132
exclude:
127133
- package: allure-pytest
128134
env:

allure-python-commons/src/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(self, mime_type, extension):
5353

5454
PNG = ("image/png", "png")
5555
JPG = ("image/jpg", "jpg")
56-
SVG = ("image/svg-xml", "svg")
56+
SVG = ("image/svg+xml", "svg")
5757
GIF = ("image/gif", "gif")
5858
BMP = ("image/bmp", "bmp")
5959
TIFF = ("image/tiff", "tiff")

0 commit comments

Comments
 (0)