Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
fail-fast: false
matrix:
include:
- { name: "3.9", python: "3.9", tox: py39 }
- { name: "3.13", python: "3.13", tox: py313 }
- { name: "lowest", python: "3.9", tox: py39-lowest }
- { name: "dev", python: "3.13", tox: py313-marshmallowdev }
- { name: "3.10", python: "3.10", tox: py310 }
- { name: "3.14", python: "3.14", tox: py314 }
- { name: "lowest", python: "3.10", tox: py310-lowest }
- { name: "dev", python: "3.14", tox: py314-marshmallowdev }
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
Expand All @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: "3.13"
python-version: "3.14"
- name: Install pypa/build
run: python -m pip install build
- name: Build a binary wheel and a source tarball
Expand All @@ -54,7 +54,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: "3.13"
python-version: "3.14"
- run: python -m pip install tox
- run: python -m tox -elint
publish-to-pypi:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Bug fixes:

* Add missing commas in error message for ``validate.FileType`` (:pr:`374`).

Support:

* Support Python 3.10-3.14 (:pr:`376`).

1.3.0 (2025-01-06)
******************

Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description = "Flask + marshmallow for beautiful APIs"
readme = "README.rst"
license = { file = "LICENSE" }
maintainers = [
{ name = "Steven Loria", email = "sloria1@gmail.com" },
{ name = "Steven Loria", email = "oss@stevenloria.com" },
{ name = "Stephen Rosen", email = "sirosen0@gmail.com" },
]
classifiers = [
Expand All @@ -14,14 +14,14 @@ classifiers = [
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
]
requires-python = ">=3.9"
requires-python = ">=3.10"
dependencies = ["Flask>=2.2", "marshmallow>=3.0.0"]

[project.urls]
Expand All @@ -35,7 +35,7 @@ docs = [
"sphinx-issues==5.0.1",
]
tests = ["flask-marshmallow[sqlalchemy]", "pytest"]
dev = ["flask-marshmallow[tests]", "tox", "pre-commit>=3.5,<5.0"]
dev = ["flask-marshmallow[tests]", "tox", "pre-commit>=4.5,<5.0"]
sqlalchemy = ["flask-sqlalchemy>=3.0.0", "marshmallow-sqlalchemy>=0.29.0"]

[build-system]
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tox]
envlist=
lint
py{39,310,311,312,313}
py313-marshmallowdev
py39-lowest
py{310,311,312,313,314}
py314-marshmallowdev
py310-lowest
docs

[testenv]
Expand All @@ -20,7 +20,7 @@ deps =
commands = pytest {posargs}

[testenv:lint]
deps = pre-commit~=3.5
deps = pre-commit~=4.5.1
skip_install = true
commands = pre-commit run --all-files

Expand Down