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
9 changes: 4 additions & 5 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
- "3.12"
- "3.11"
- "3.10"
- "3.9"
- "pypy3.11"
os:
- ubuntu-24.04
Expand All @@ -42,7 +41,7 @@ jobs:
- name: "🔄 Install the latest version of uv"
uses: astral-sh/setup-uv@v7
- name: "🧪 Install tox"
run: uv tool install --python-preference only-managed --python 3.13 tox --with tox-uv
run: uv tool install --python-preference only-managed --python 3.14 tox --with tox-uv
- name: "🐍 Install Python"
run: uv python install --python-preference only-managed ${{ matrix.py }}
- name: "⚙️ Setup test suite"
Expand Down Expand Up @@ -87,9 +86,9 @@ jobs:
- name: "🔄 Install the latest version of uv"
uses: astral-sh/setup-uv@v7
- name: "🧪 Install tox"
run: uv tool install --python-preference only-managed --python 3.13 tox --with tox-uv
run: uv tool install --python-preference only-managed --python 3.14 tox --with tox-uv
- name: "📦 Build package to generate version"
run: uv build --python 3.13 --python-preference only-managed --wheel . --out-dir dist
run: uv build --python 3.14 --python-preference only-managed --wheel . --out-dir dist
- name: "⚙️ Setup coverage tool"
run: tox -e coverage --notest
env:
Expand Down Expand Up @@ -133,7 +132,7 @@ jobs:
- name: "🔄 Install the latest version of uv"
uses: astral-sh/setup-uv@v7
- name: "🧪 Install tox"
run: uv tool install --python-preference only-managed --python 3.13 tox --with tox-uv
run: uv tool install --python-preference only-managed --python 3.14 tox --with tox-uv
- name: "⚙️ Setup test suite"
run: tox run -vv --notest --skip-missing-interpreters false -e ${{ matrix.tox_env }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: "🔄 Install the latest version of uv"
uses: astral-sh/setup-uv@v7
- name: "📦 Build package"
run: uv build --python 3.13 --python-preference only-managed --sdist --wheel . --out-dir dist
run: uv build --python 3.14 --python-preference only-managed --sdist --wheel . --out-dir dist
- name: "📤 Store the distribution packages"
uses: actions/upload-artifact@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ repos:
- id: codespell
additional_dependencies: ["tomli>=2.2.1"]
- repo: https://github.com/tox-dev/tox-toml-fmt
rev: "v1.0.0"
rev: "v1.1.0"
hooks:
- id: tox-toml-fmt
- repo: https://github.com/tox-dev/pyproject-fmt
rev: "v2.7.0"
rev: "v2.8.0"
hooks:
- id: pyproject-fmt
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.13.3"
rev: "v0.14.0"
hooks:
- id: ruff-format
- id: ruff
- id: ruff-check
args: ["--fix", "--unsafe-fixes", "--exit-non-zero-on-fix"]
- repo: https://github.com/rbubley/mirrors-prettier
rev: "v3.6.2" # Use the sha / tag you want to point at
Expand Down
34 changes: 17 additions & 17 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ license = "Unlicense"
maintainers = [
{ name = "Bernát Gábor", email = "gaborjbernat@gmail.com" },
]
requires-python = ">=3.9"
requires-python = ">=3.10"
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: The Unlicense (Unlicense)",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"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",
"Topic :: Software Development :: Libraries",
"Topic :: System",
Expand All @@ -57,36 +57,36 @@ dev = [

test = [
"covdefaults>=2.3",
"diff-cover>=9.6",
"pytest>=8.4.1",
"pytest-asyncio>=1.1",
"pytest-cov>=6.2.1",
"pytest-mock>=3.14.1",
"diff-cover>=9.7.1",
"pytest>=8.4.2",
"pytest-asyncio>=1.2",
"pytest-cov>=7",
"pytest-mock>=3.15.1",
"pytest-timeout>=2.4",
"virtualenv>=20.33.1",
"virtualenv>=20.34",
]
type = [
"mypy>=1.17.1",
"typing-extensions>=4.14.1; python_version<'3.11'",
"mypy>=1.18.2",
"typing-extensions>=4.15; python_version<'3.11'",
{ include-group = "test" },
]
docs = [
"furo>=2025.7.19",
"furo>=2025.9.25",
"sphinx>=8.2.3",
"sphinx-autodoc-typehints>=3.2",
]
fix = [
"pre-commit-uv>=4.1.4",
"pre-commit-uv>=4.1.5",
]
pkg-meta = [
"check-wheel-contents>=0.6.3",
"twine>=6.1",
"uv>=0.8.5",
"twine>=6.2",
"uv>=0.8.22",
]
coverage = [
"covdefaults>=2.3",
"coverage[toml]>=7.10.2",
"diff-cover>=9.6",
"coverage[toml]>=7.10.7",
"diff-cover>=9.7.1",
]

[tool.hatch]
Expand Down Expand Up @@ -140,7 +140,7 @@ quiet-level = 3
ignore-words-list = "master"

[tool.pyproject-fmt]
max_supported_python = "3.13"
max_supported_python = "3.14"

[tool.pytest.ini_options]
asyncio_default_fixture_loop_scope = "session"
Expand Down
3 changes: 2 additions & 1 deletion src/filelock/asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from dataclasses import dataclass
from inspect import iscoroutinefunction
from threading import local
from typing import TYPE_CHECKING, Any, Callable, NoReturn, cast
from typing import TYPE_CHECKING, Any, NoReturn, cast

from ._api import BaseFileLock, FileLockContext, FileLockMeta
from ._error import Timeout
Expand All @@ -20,6 +20,7 @@

if TYPE_CHECKING:
import sys
from collections.abc import Callable
from concurrent import futures
from types import TracebackType

Expand Down
6 changes: 3 additions & 3 deletions tests/test_filelock.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from pathlib import Path, PurePath
from stat import S_IWGRP, S_IWOTH, S_IWUSR, filemode
from types import TracebackType
from typing import TYPE_CHECKING, Any, Callable, Union
from typing import TYPE_CHECKING, Any
from uuid import uuid4
from weakref import WeakValueDictionary

Expand All @@ -21,7 +21,7 @@
from filelock import BaseFileLock, FileLock, SoftFileLock, Timeout, UnixFileLock, WindowsFileLock

if TYPE_CHECKING:
from collections.abc import Iterator
from collections.abc import Callable, Iterator

from pytest_mock import MockerFixture

Expand Down Expand Up @@ -220,7 +220,7 @@ def test_nested_contruct(lock_type: type[BaseFileLock], tmp_path: Path) -> None:
assert not lock_1.is_locked


_ExcInfoType = Union[tuple[type[BaseException], BaseException, TracebackType], tuple[None, None, None]]
_ExcInfoType = tuple[type[BaseException], BaseException, TracebackType] | tuple[None, None, None]


class ExThread(threading.Thread):
Expand Down
6 changes: 3 additions & 3 deletions tox.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
requires = [ "tox>=4.28.4" ]
env_list = [ "fix", "3.14t", "3.14", "3.13", "3.12", "3.11", "3.10", "3.9", "coverage", "type", "docs", "pkg_meta" ]
requires = [ "tox>=4.30.2" ]
env_list = [ "fix", "3.14t", "3.14", "3.13", "3.12", "3.11", "3.10", "coverage", "type", "docs", "pkg_meta" ]
skip_missing_interpreters = true

[env_run_base]
Expand Down Expand Up @@ -71,7 +71,7 @@ commands = [
],
]
parallel_show_output = true
depends = [ "3.14t", "3.14", "3.13", "3.12", "3.11", "3.10", "3.9" ]
depends = [ "3.14t", "3.14", "3.13", "3.12", "3.11", "3.10" ]

[env.fix]
description = "format the code base to adhere to our styles, and complain about what we cannot do automatically"
Expand Down