Skip to content

Commit 4b5a2e6

Browse files
committed
Drop support for marshmallow 3
1 parent be929f3 commit 4b5a2e6

File tree

5 files changed

+17
-24
lines changed

5 files changed

+17
-24
lines changed

.github/workflows/build-release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- { name: "3.10-ma3", tox: py310-marshmallow3 }
21-
- { name: "3.14-ma3", tox: py314-marshmallow3 }
22-
- { name: "3.10-ma4", tox: py310-marshmallow4 }
23-
- { name: "3.14-ma4", tox: py314-marshmallow4 }
20+
- { name: "3.10", tox: py310 }
21+
- { name: "3.14", tox: py314 }
2422
- { name: "lowest", tox: py310-lowest }
2523
- { name: "3.14-madev", tox: py314-marshmallowdev }
2624
steps:

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
---------
33

4+
unreleased
5+
**********
6+
7+
Other changes:
8+
9+
- Drop support for marshmallow 3, which is EOL.
10+
411
6.10.0 (2026-03-06)
512
*******************
613

README.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apispec
33
*******
44

5-
|pypi| |build-status| |docs| |marshmallow-support| |openapi|
5+
|pypi| |build-status| |docs| |openapi|
66

77
.. |pypi| image:: https://badgen.net/pypi/v/apispec
88
:target: https://pypi.org/project/apispec/
@@ -16,10 +16,6 @@ apispec
1616
:target: https://apispec.readthedocs.io/
1717
:alt: Documentation
1818

19-
.. |marshmallow-support| image:: https://badgen.net/badge/marshmallow/3,4?list=1
20-
:target: https://marshmallow.readthedocs.io/en/latest/upgrading.html
21-
:alt: marshmallow 3|4 compatible
22-
2319
.. |openapi| image:: https://badgen.net/badge/OAS/2,3?list=1&color=cyan
2420
:target: https://github.com/OAI/OpenAPI-Specification
2521
:alt: OpenAPI Specification 2/3 compatible

pyproject.toml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ name = "apispec"
33
version = "6.10.0"
44
description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification)."
55
readme = "README.rst"
6-
license = { file = "LICENSE" }
7-
authors = [{ name = "Steven Loria", email = "sloria1@gmail.com" }]
6+
license = "MIT"
7+
authors = [{ name = "Steven Loria", email = "oss@stevenloria.com" }]
88
maintainers = [
9-
{ name = "Steven Loria", email = "sloria1@gmail.com" },
9+
{ name = "Steven Loria", email = "oss@stevenloria.com" },
1010
{ name = "Jérôme Lafréchoux", email = "jerome@jolimont.fr" },
1111
]
1212
classifiers = [
1313
"Development Status :: 5 - Production/Stable",
1414
"Intended Audience :: Developers",
15-
"License :: OSI Approved :: MIT License",
1615
"Programming Language :: Python :: 3",
1716
"Programming Language :: Python :: 3.10",
1817
"Programming Language :: Python :: 3.11",
@@ -46,13 +45,7 @@ yaml = ["PyYAML>=3.10"]
4645
marshmallow = ["marshmallow>=3.18.0"]
4746

4847
[dependency-groups]
49-
docs = [
50-
"marshmallow>=3.18.0",
51-
"pyyaml",
52-
"sphinx-issues",
53-
"furo",
54-
"sphinx>=8.1",
55-
]
48+
docs = ["marshmallow>=4.0.0", "pyyaml", "sphinx-issues", "furo", "sphinx>=8.1"]
5649
tests = ["openapi-spec-validator", "pytest"]
5750
dev = [{ include-group = "tests" }, "tox", "tox-uv", "pre-commit>=3.5,<5.0"]
5851

tox.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist=
33
lint
4-
py{310,311,312,313,314}-marshmallow{3,4}
4+
py{310,311,312,313,314}
55
py314-marshmallowdev
66
py310-lowest
77
docs
@@ -10,13 +10,12 @@ envlist=
1010
extras = yaml,marshmallow
1111
dependency_groups = tests
1212
deps =
13-
marshmallow3: marshmallow>=3.18.0,<4.0.0
1413
marshmallowdev: https://github.com/marshmallow-code/marshmallow/archive/dev.tar.gz
15-
lowest: marshmallow==3.18.0
14+
lowest: marshmallow==4.0.0
1615
commands = pytest {posargs}
1716

1817
[testenv:lint]
19-
deps = pre-commit~=3.5
18+
deps = pre-commit
2019
skip_install = true
2120
commands = pre-commit run --all-files
2221

0 commit comments

Comments
 (0)