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
8 changes: 4 additions & 4 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
fail-fast: false
matrix:
include:
- { name: "3.10", tox: py310 }
- { name: "3.14", tox: py314 }
- { name: "lowest", tox: py310-lowest }
- { name: "dev", tox: py314-marshmallowdev }
- { name: "3.11", tox: py311 }
- { name: "3.15", tox: py315 }
- { name: "lowest", tox: py311-lowest }
- { name: "dev", tox: py315-marshmallowdev }
- { name: "mypy-madev", tox: mypy-marshmallowdev }
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ formats:
build:
os: ubuntu-24.04
tools:
python: "3.13"
python: "3.14"
jobs:
pre_create_environment:
- asdf plugin add uv
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Changelog
---------

unreleased
++++++++++

Other changes:

* Drop support for Python 3.10.
* Test against Python 3.15.

1.6.0 (2026-10-19)
++++++++++++++++++

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ maintainers = [{ name = "Steven Loria", email = "oss@stevenloria.com" }]
classifiers = [
"Intended Audience :: Developers",
"Programming Language :: Python :: 3",
"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",
"Programming Language :: Python :: 3.15",
]
requires-python = ">=3.10"
requires-python = ">=3.11"
dependencies = ["marshmallow>=4.0.0", "SQLAlchemy>=1.4.40,<3.0"]

[project.urls]
Expand Down
8 changes: 2 additions & 6 deletions src/marshmallow_sqlalchemy/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
TYPE_CHECKING,
Any,
Literal,
TypeAlias,
TypeGuard,
cast,
overload,
)

# Remove when dropping Python 3.9
try:
from typing import TypeAlias, TypeGuard
except ImportError:
from typing import TypeAlias, TypeGuard

import marshmallow as ma
import sqlalchemy as sa
from marshmallow import fields, validate
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class Student(Base):
dob = sa.Column(sa.Date(), nullable=True)
date_created = sa.Column(
sa.DateTime,
default=lambda: dt.datetime.now(dt.timezone.utc),
default=lambda: dt.datetime.now(dt.UTC),
doc="date the student was created",
)

Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
requires = tox-uv
envlist=
lint
py{310,311,312,313,314}
py314-marshmallowdev
py310-lowest
py{311,312,313,314,315}
py315-marshmallowdev
py311-lowest
mypy-marshmallowdev
docs

Expand All @@ -13,11 +13,11 @@ runner = uv-venv-lock-runner
dependency_groups = tests
commands = pytest {posargs}

[testenv:py314-marshmallowdev]
[testenv:py315-marshmallowdev]
runner = uv-venv-runner
deps = https://github.com/marshmallow-code/marshmallow/archive/dev.tar.gz

[testenv:py310-lowest]
[testenv:py311-lowest]
runner = uv-venv-runner
deps =
marshmallow==4.0.0
Expand Down
589 changes: 25 additions & 564 deletions uv.lock

Large diffs are not rendered by default.

Loading