Skip to content

Commit c0e5084

Browse files
committed
Test on both marshmallow 3 and 4
1 parent 605e720 commit c0e5084

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.github/workflows/build-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
include:
15-
- { name: '3.9', python: '3.9', tox: py39 }
16-
- { name: '3.13', python: '3.13', tox: py313 }
15+
- { name: '3.9-ma3', python: '3.9', tox: py39-marshmallow3 }
16+
- { name: '3.9-ma4', python: '3.9', tox: py39-marshmallow4 }
17+
- { name: '3.13-ma4', python: '3.13', tox: py313-marshmallow4 }
1718
steps:
1819
- uses: actions/checkout@v4
1920
- uses: actions/setup-python@v5

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ requires-python = ">=3.9"
2626
dependencies = [
2727
"werkzeug>=3.0.1,<4",
2828
"flask>=3.0.2,<4",
29-
"marshmallow>=3.24.1,<4",
29+
"marshmallow>=3.24.1,<5",
3030
"webargs>=8.0.0,<9",
3131
"apispec[marshmallow]>=6.0.0,<7",
3232
]
@@ -51,7 +51,7 @@ tests = [
5151
"coverage==7.8.0",
5252
"werkzeug==3.1.3",
5353
"flask==3.1.0",
54-
"marshmallow==3.26.1",
54+
"marshmallow",
5555
"webargs==8.6.0",
5656
"apispec==6.8.1",
5757
"PyYAML==6.0.2",

tox.ini

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
[tox]
2-
envlist = lint,py39,py310,py311,py312,py313
2+
envlist =
3+
lint
4+
{py39,py310,py311,py312,py313}-marshmallow4
5+
py39-marshmallow3
36
skip_missing_interpreters = True
47

58
[testenv]
69
extras = tests
10+
deps =
11+
marshmallow3: marshmallow>=3.26.1,<4
12+
marshmallow4: marshmallow>=4.0.0,<5
713
commands =
814
pytest --cov=flask_smorest --cov-branch --cov-report=term-missing --cov-report=xml
915

0 commit comments

Comments
 (0)