Modernize project configuration: uv, Python 3.10+, PEP 639, CI coverage

- Require Python >= 3.10 (3.9 is EOL and held back the toolchain:
  tokenizer >= 3.6.3, current mypy and setuptools all need 3.10+);
  bump version to 3.7.0, tokenizer floor to >= 3.6.3
- Adopt uv properly: commit uv.lock, move dev dependencies to PEP 735
  [dependency-groups] (adding ruff and mypy; mypy excluded on PyPy where
  its native dependencies don't build), use astral-sh/setup-uv and
  'uv sync --locked' in CI
- Switch license metadata to PEP 639 SPDX form (license = "MIT",
  license-files), drop the deprecated license classifier, require
  setuptools >= 77.0.3 in the build system
- Move mypy configuration into pyproject.toml [tool.mypy] (target 3.10);
  drop the unused [tool.isort] section
- Test on Windows and macOS (one job each) in addition to the Linux
  matrix, since wheels are shipped for all three platforms
- Pin cibuildwheel (4.1.0) in the wheels workflow; build cp310 abi3
  wheels; remove vestigial git-lfs configuration (no files use LFS)
- Update README and CLAUDE.md accordingly

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: vthorsteinsson

.gitattributes

@@ -1,6 +1,3 @@
-src/reynir/resources/ordalisti-*.bin filter=lfs diff=lfs merge=lfs -text
-src/reynir/resources/ord.compressed filter=lfs diff=lfs merge=lfs -text
-
 # Set the default line ending behavior to auto
 * text=auto
 

.github/workflows/python-package.yml

@@ -13,25 +13,27 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "pypy-3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.11"]
+        # The Windows and macOS wheels are built from the same sources,
+        # so test at least one Python version on each of those platforms
+        include:
+          - os: windows-latest
+            python-version: "3.13"
+          - os: macos-latest
+            python-version: "3.13"
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Install uv
+      uses: astral-sh/setup-uv@v8
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install GreynirEngine
-      run: |
-        python -m pip install uv
-        uv pip install --system wheel setuptools pytest ruff
-        uv pip install --system -e .
+      run: uv sync --locked
     - name: Lint with ruff
-      run: |
-        ruff check src/reynir
+      run: uv run ruff check src/reynir
     - name: Test with pytest
-      run: |
-        python -m pytest
+      run: uv run pytest
     - name: Slack notification
       uses: 8398a7/action-slack@v3
       with:

.github/workflows/wheels.yml

@@ -16,26 +16,25 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
       - name: Install cibuildwheel
-        run: python -m pip install --upgrade pip wheel setuptools cibuildwheel
+        # Pinned so that releases only change toolchain when we choose to
+        run: python -m pip install --upgrade pip wheel setuptools cibuildwheel==4.1.0
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
         # Options (https://cibuildwheel.readthedocs.io/en/stable/options/)
         env:
-          # Build abi3 wheel for CPython 3.9+ (one wheel for all versions)
+          # Build abi3 wheel for CPython 3.10+ (one wheel for all versions)
           # Build version-specific wheel for PyPy (which doesn't support abi3)
-          CIBW_BUILD: cp39-* pp311-*
+          CIBW_BUILD: cp310-* pp311-*
           CIBW_SKIP: "*musllinux*"
           CIBW_ENABLE: pypy
-          CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
+          CIBW_PROJECT_REQUIRES_PYTHON: ">=3.10"
           CIBW_BEFORE_BUILD_MACOS: python3 -m pip install --upgrade setuptools wheel cffi
           CIBW_ARCHS_MACOS: "x86_64 arm64"
           CIBW_ARCHS_WINDOWS: "AMD64"
@@ -54,8 +53,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - uses: actions/setup-python@v5
         with:

.gitignore

@@ -95,7 +95,6 @@ p37/
 pypy*
 
 # uv stuff
-uv.lock
 .python-version
 
 # Installer logs

CLAUDE.md

@@ -7,32 +7,38 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 GreynirEngine (PyPI package name: `reynir`, imported as `reynir`) is an NLP engine
 for parsing Icelandic text into sentence trees. It combines a hand-written
 context-free grammar for Icelandic with a C++ Earley-Scott parser core, wrapped
-via CFFI. Source lives in `src/reynir/`. Supports CPython 3.9+ and PyPy 3.11+.
+via CFFI. Source lives in `src/reynir/`. Supports CPython 3.10+ and PyPy 3.11+.
 
 ## Commands
 
+The project uses [uv](https://docs.astral.sh/uv/) with a committed `uv.lock`;
+dev dependencies live in `[dependency-groups]` in `pyproject.toml`.
+
 ```sh
-# Install for development (compiles the C++ parser extension via CFFI)
-pip install -e .
+# Set up the dev environment (installs dev deps from uv.lock and
+# compiles the C++ parser extension via CFFI)
+uv sync
 
 # Run all tests
-python -m pytest
+uv run pytest
 
 # Run a single test file / single test
-python -m pytest test/test_parse.py
-python -m pytest test/test_parse.py::test_long_parse
+uv run pytest test/test_parse.py
+uv run pytest test/test_parse.py::test_long_parse
 
 # Lint (CI runs this)
-ruff check src/reynir
+uv run ruff check src/reynir
 
-# Type check (config in mypy.ini, targets Python 3.9)
-mypy src/reynir
+# Type check (config in pyproject.toml [tool.mypy]; carries a handful of
+# known pre-existing errors, so it is not a CI gate)
+uv run mypy src/reynir
 ```
 
-Note: `pip install -e .` must be re-run after changing the C++ sources
-(`eparser.cpp`, `eparser.h`) or `eparser_build.py`, since the `_eparser`
-CFFI extension is compiled at install time (see `setup.py`, which exists only
-for the `cffi_modules` hook; all other metadata is in `pyproject.toml`).
+Note: after changing the C++ sources (`eparser.cpp`, `eparser.h`) or
+`eparser_build.py`, force a rebuild of the `_eparser` CFFI extension with
+`uv sync --reinstall-package reynir` (the extension is compiled at install
+time; see `setup.py`, which exists only for the `cffi_modules` hook — all
+other metadata is in `pyproject.toml`).
 
 ## Architecture
 
@@ -92,8 +98,9 @@ The public API is defined by the exports in `src/reynir/__init__.py`.
   `so`=verb, `nf`/`þf`/`þgf`/`ef`=cases, `et`/`ft`=number, `kk`/`kvk`/`hk`=gender);
   these appear throughout the code, tests and grammar files.
 - Ruff line length is 88; `E731` (lambda assignment) is ignored.
-- CI (`.github/workflows/python-package.yml`) runs ruff + pytest on
-  Python 3.9–3.14 and PyPy 3.11. Wheels are built via cibuildwheel on tag push
-  (abi3 wheel for CPython, version-specific for PyPy).
+- CI (`.github/workflows/python-package.yml`) runs ruff + pytest via
+  `uv sync --locked` on Python 3.10–3.14 and PyPy 3.11 on Linux, plus one
+  job each on Windows and macOS. Wheels are built on tag push via a pinned
+  cibuildwheel (`cp310` abi3 wheel for CPython, version-specific for PyPy).
 - The `old/` and `build/` directories contain legacy/build artifacts — do not
   edit code there.

README.md

@@ -1,5 +1,5 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3817/)
+[![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/)
 ![Release](https://shields.io/github/v/release/mideind/GreynirEngine?display_name=tag)
 ![PyPI](https://img.shields.io/pypi/v/reynir)
 [![Build](https://github.com/mideind/GreynirEngine/actions/workflows/python-package.yml/badge.svg)]()
@@ -12,7 +12,7 @@
 
 ## Overview
 
-Greynir is a Python 3 (>=3.9) package,
+Greynir is a Python 3 (>=3.10) package,
 published by [Miðeind ehf.](https://mideind.is), for
 **working with Icelandic natural language text**.
 Greynir can parse text into **sentence trees**, find **lemmas**,
@@ -147,7 +147,7 @@ and each token annotated with its lemma and POS tag (`no`=noun, `so`=verb):
 
 ## Prerequisites
 
-This package runs on CPython 3.9 or newer, and on PyPy 3.11 or newer.
+This package runs on CPython 3.10 or newer, and on PyPy 3.11 or newer.
 
 To find out which version of Python you have, enter:
 
@@ -195,14 +195,17 @@ The package source code is in `GreynirEngine/src/reynir`.
 
 ## Tests
 
-To run the built-in tests, install [pytest](https://docs.pytest.org/en/latest),
-`cd` to your `GreynirEngine` subdirectory (and optionally activate your
-virtualenv), then run:
+To run the built-in tests, `cd` to your `GreynirEngine` subdirectory and,
+using [uv](https://docs.astral.sh/uv/), run:
 
 ````sh
-python -m pytest
+uv sync
+uv run pytest
 ````
 
+Alternatively, install [pytest](https://docs.pytest.org/en/latest) into
+your virtualenv and run `python -m pytest`.
+
 ## Evaluation
 
 A parsing test pipeline for different parsing schemas, including the Greynir schema,

pyproject.toml

@@ -1,30 +1,29 @@
 [build-system]
-requires = ["setuptools>=61.0", "cffi>=1.15.1"]
+requires = ["setuptools>=77.0.3", "cffi>=1.15.1"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "reynir"
-version = "3.6.2"
+version = "3.7.0"
 description = "A natural language parser for Icelandic"
 authors = [{ name = "Miðeind ehf.", email = "mideind@mideind.is" }]
 maintainers = [{ name = "Miðeind ehf.", email = "mideind@mideind.is" }]
 readme = { file = "README.md", content-type = "text/markdown" }
-license = { text = "MIT License" }
+license = "MIT"
+license-files = ["LICENSE.txt"]
 keywords = ["nlp", "parser", "icelandic"]
 classifiers = [
     # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: Unix",
     "Operating System :: POSIX",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: MacOS",
     "Natural Language :: Icelandic",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -36,10 +35,10 @@ classifiers = [
     "Topic :: Utilities",
     "Topic :: Text Processing :: Linguistic",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "cffi>=1.17.1",
-    "tokenizer>=3.6.0",
+    "tokenizer>=3.6.3",
     "islenska>=1.3.2",
     "filelock>=3.9.0",
     "typing_extensions",
@@ -51,9 +50,16 @@ Homepage = "https://greynir.is"
 Documentation = "https://greynir.is/doc/"
 Issues = "https://github.com/mideind/GreynirEngine/issues"
 
-[project.optional-dependencies]
-# dev dependencies
-dev = ["pytest", "setuptools"]
+[dependency-groups]
+# Development dependencies: uv installs these automatically with 'uv sync';
+# with pip (>=25.1), use 'pip install --group dev'.
+# mypy is excluded on PyPy, where its native dependencies don't build.
+dev = [
+    "pytest",
+    "ruff",
+    "mypy; implementation_name != 'pypy'",
+    "setuptools",
+]
 
 # *** Configuration of tools ***
 
@@ -78,7 +84,6 @@ ignore = [
     "E731", # 'E731: Do not assign a lambda expression, use a def'
 ]
 
-[tool.isort]
-# This forces these imports to placed at the top
-known_future_library = ["__future__", "typing", "typing_extensions"]
-line_length = 88
+[tool.mypy]
+python_version = "3.10"
+exclude = ['doc/conf\.py']