Add python 3.14 support and stronger type checking

.github/workflows/ci.yml

@@ -110,11 +110,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
           - "pypy-3.11"
         wlroots-version: ["0.17.4"]
     steps:
@@ -179,32 +179,20 @@ jobs:
           WLR_LIBINPUT_NO_DEVICES: '1'
           WLR_RENDERER: pixman
           WLR_RENDERER_ALLOW_SOFTWARE: '1'
-  ruff-test:
-    name: ruff tests
-    runs-on: ubuntu-24.04
-    env:
-      python-version: "3.13"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.python-version }}
-      - name: Run ruff check
-        uses: astral-sh/ruff-action@v3
-  mypy-test:
-    name: mypy tests
+  pre-commit-test:
+    name: pre-commit tests
     runs-on: ubuntu-24.04
     needs: build-wayland
     env:
-      python-version: "3.13"
+      python-version: "3.14"
       wlroots-version: "0.17.4"
     steps:
       - name: Install dependencies
         run: |
           sudo apt update
           sudo apt-get install -y --no-install-recommends \
+            libinput-dev \
+            libpixman-1-dev \
             libxkbcommon-dev \
       - name: Download wayland libraries
         uses: actions/download-artifact@v4
@@ -220,36 +208,15 @@ jobs:
           python-version: ${{ env.python-version }}
       - name: Install Python dependencies
         run: |
-          pip install wheel
-          pip install -r requirements.txt
-          pip install mypy types-cffi types-dataclasses
-      - name: Run mypy test
-        run: |
-          mypy -p wlroots
-          mypy -p tiny
-  black-test:
-    name: black tests
-    runs-on: ubuntu-24.04
-    env:
-      python-version: "3.13"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.python-version }}
-      - name: Install Python dependencies
-        run: |
-          pip install black
-      - name: Run black test
-        run: black --check wlroots tiny
+          pip install .
+      - name: Run pre-commit test
+        uses: pre-commit/action@v3.0.1
   packaging-test:
     name: packaging tests
     runs-on: ubuntu-24.04
     needs: build-wayland
     env:
-      python-version: "3.13"
+      python-version: "3.14"
       wlroots-version: "0.17.4"
     steps:
       - name: Download wayland libraries
@@ -262,6 +229,8 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get install -y --no-install-recommends \
+            libinput-dev \
+            libpixman-1-dev \
             libxkbcommon-dev \
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -271,9 +240,7 @@ jobs:
           python-version: ${{ env.python-version }}
       - name: Install Python dependencies
         run: |
-          pip install wheel
-          pip install -r requirements.txt
-          pip install check-manifest twine
+          pip install .[packaging]
       - name: Run packaging test
         run: |
           check-manifest
@@ -285,7 +252,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs: build-wayland
     env:
-      python-version: "3.13"
+      python-version: "3.14"
       wlroots-version: "0.17.4"
     steps:
       - name: Download wayland libraries

.github/workflows/release.yml

@@ -168,7 +168,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
       - name: Download wayland libraries
         uses: actions/download-artifact@v4
@@ -278,11 +278,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
           - "pypy-3.11"
     steps:
       - name: Install dependencies
@@ -323,7 +323,7 @@ jobs:
     container: quay.io/pypa/manylinux_2_34_x86_64
     needs: build-wayland
     env:
-      python-version: "3.13"
+      python-version: "3.14"
     steps:
       - name: Download wayland libraries
         uses: actions/download-artifact@v4

.pre-commit-config.yaml

@@ -1,11 +1,12 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-      - id: black
-        # Use the latest supported version here
-        language_version: python3.13
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.0
+    rev: v0.14.4
+    hooks:
+      - id: ruff-check
+        args: [--fix]
+      - id: ruff-format
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.18.2
     hooks:
-      - id: ruff
+      - id: mypy
+        files: "^(wlroots|tiny)\/.*"

pyproject.toml

@@ -12,19 +12,19 @@ build-backend = "setuptools.build_meta"
 name = "pywlroots"
 description = "Python binding to the wlroots library using cffi"
 authors = [{name = "Sean Vig", email = "sean.v.775@gmail.com"}]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "NCSA"
 readme = "README.rst"
 classifiers = [
     "Development Status :: 2 - Pre-Alpha",
     "Operating System :: POSIX",
     "Operating System :: POSIX :: Linux",
     "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",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Desktop Environment :: Window Managers",
@@ -39,10 +39,10 @@ dynamic = ["version"]
 
 [project.optional-dependencies]
 test = ["pytest"]
-typecheck = [
-    "mypy",
-    "types-cffi",
-    "types-dataclasses",
+packaging = [
+    "build",
+    "check-manifest",
+    "twine",
 ]
 
 [project.urls]
@@ -71,31 +71,30 @@ lint.select = ['E', 'F', 'I', 'N', 'W', 'UP', 'RUF']
 lint.ignore = ["E501"]
 line-length = 88
 
-[tool.black]
-line-length = 88
+[tool.check-manifest]
+ignore = [
+    "wlroots/_build.py",
+    "wlroots/include/*.h",
+]
 
 [tool.mypy]
-check_untyped_defs = true
-# disallow_any_decorated = true
-# disallow_any_explicit = true
-# disallow_any_expr = true
-# disallow_any_generics = true
-# disallow_any_unimported = true
-# disallow_incomplete_defs = true
+packages = ["wlroots", "tiny"]
+warn_unused_configs = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+strict_equality = true
 disallow_subclassing_any = true
-# disallow_untyped_calls = true
-# disallow_untyped_decorators = true
-# disallow_untyped_defs = true
+disallow_untyped_decorators = true
+disallow_any_generics = true
+disallow_untyped_calls = true
+disallow_incomplete_defs = true
+disallow_untyped_defs = true
+# warn_return_any = true
 no_implicit_optional = true
 show_error_codes = true
-strict_equality = true
 warn_incomplete_stub = true
 warn_no_return = true
-warn_redundant_casts = true
-# warn_return_any = true
 warn_unreachable = true
-warn_unused_configs = true
-warn_unused_ignores = true
 
 [[tool.mypy.overrides]]
 module = [

setup.py

@@ -1,33 +1,13 @@
 # Copyright (c) Sean Vig 2018
 
-import glob
-import os
 import subprocess
 import sys
 
 from setuptools import setup
-from setuptools.command.sdist import sdist
-
-
-class SdistClean(sdist):
-    def run(self):
-        # These files are not tracked by git and as a result check-manifest complains
-        # when present, '_build.py' needs to be removed manually since it keeps being
-        # created by other setup commands and '.h' files are needen only during build
-        files = glob.glob("wlroots/include/*.h")
-        files.append("wlroots/_build.py")
-        for file in files:
-            try:
-                os.remove(file)
-            except Exception:
-                pass
-        sdist.run(self)
-
 
 sys.path.insert(0, "wlroots")
 
 subprocess.run(["python", "wlroots/include/check_headers.py", "--generate"])
 setup(
-    cmdclass={"sdist": SdistClean},
     cffi_modules=["wlroots/ffi_build.py:ffi_builder"],
 )

tiny/__main__.py

@@ -8,6 +8,7 @@
 
 import logging
 import sys
+from collections.abc import Sequence
 
 from pywayland.server import Display
 
@@ -26,7 +27,7 @@
 from .server import TinywlServer
 
 
-def main(argv) -> None:
+def main(argv: Sequence[str] | None) -> None:
     with Display() as display:
         _, allocator, renderer, backend, _ = build_compositor(display)
         device_manager = DataDeviceManager(display)  # noqa: F841

tiny/keyboard_handler.py

@@ -5,6 +5,8 @@
 from pywayland.server import Listener
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from wlroots.wlr_types import InputDevice, Keyboard
     from wlroots.wlr_types.keyboard import KeyboardKeyEvent
 
@@ -25,7 +27,7 @@ def __init__(
         keyboard.modifiers_event.add(Listener(self.keyboard_handle_modifiers))
         keyboard.key_event.add(Listener(self.keyboard_handle_key))
 
-    def keyboard_handle_modifiers(self, listener: Listener, data) -> None:
+    def keyboard_handle_modifiers(self, listener: Listener, data: Any) -> None:
         """Activates the keyboard and sends the modifiers event to the active surface"""
         self.tinywl_server.send_modifiers(self.keyboard.modifiers, self.input_device)