Merge branch 'main' into fix-error-code

Author: eemeli

.flake8

@@ -1,4 +1,4 @@
 [flake8]
-exclude=.tox
+exclude=.venv
 extend-ignore = E203
 max-line-length=120

.github/workflows/ci.yml

@@ -5,46 +5,38 @@ on:
     branches:
       - main
   pull_request:
+  workflow_dispatch:
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: astral-sh/setup-uv@v7
         with:
-          cache: pip
-          cache-dependency-path: |
-            dev-requirements.txt
-            fluent.syntax/setup.py
-            fluent.runtime/setup.py
-      - run: python -m pip install -r dev-requirements.txt
-      - run: python -m pip install ./fluent.syntax ./fluent.runtime
-      - run: python -m flake8
-      - run: python -m mypy fluent.syntax/fluent fluent.runtime/fluent
+          python-version: 3.9
+      - uses: actions/setup-python@v6
+      - run: uv sync --dev --all-packages
+      - run: uv run python -m flake8
+      - run: uv run mypy fluent.syntax/fluent fluent.runtime/fluent
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022]
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3.9, pypy3.10]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
-          cache: pip
-          cache-dependency-path: |
-            fluent.syntax/setup.py
-            fluent.runtime/setup.py
-      - run: python -m pip install ./fluent.syntax ./fluent.runtime
-      - run: python -m unittest discover -s fluent.syntax
-      - run: python -m unittest discover -s fluent.runtime
+      - run: uv sync --dev --all-packages
+      - run: uv run python -m unittest discover -s fluent.syntax
+      - run: uv run python -m unittest discover -s fluent.runtime
 
-  # Test compatibility with the oldest Python version we claim to support,
-  # and for fluent.runtime's compatibility with a range of fluent.syntax versions.
+  # Test fluent.runtime's compatibility with a range of fluent.syntax versions.
   compatibility:
-    runs-on: ubuntu-20.04 # https://github.com/actions/setup-python/issues/544
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         fluent-syntax:
@@ -53,10 +45,11 @@ jobs:
           - fluent.syntax==0.18.1 six
           - fluent.syntax==0.17.0 six
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v6
+      - uses: astral-sh/setup-uv@v7
         with:
-          python-version: 3.6
-      - run: python -m pip install ${{ matrix.fluent-syntax }}
-      - run: python -m pip install ./fluent.runtime
-      - run: python -m unittest discover -s fluent.runtime
+          python-version: 3.12
+      - run: uv venv
+      - run: uv pip install ${{ matrix.fluent-syntax }}
+      - run: uv pip install ./fluent.runtime
+      - run: uv run python -m unittest discover -s fluent.runtime

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "python.autoComplete.extraPaths": ["./fluent.syntax"],
+  "python.analysis.extraPaths": ["./fluent.syntax"],
+}

README.md

@@ -0,0 +1,38 @@
+# Project Fluent
+
+This is a collection of Python packages to use the
+[Fluent localization system](http://projectfluent.org/):
+
+## `fluent.syntax`
+
+The [syntax package](./fluent.syntax) includes the
+parser, serializer, and traversal utilities like `Visitor` and `Transformer`.
+You’re looking for this package if you work on tooling for Fluent in Python.
+
+## `fluent.runtime`
+
+The [runtime package](./fluent.runtime) includes the library required to
+use Fluent to localize your Python application.
+It comes with a `Localization` class to use, based on an implementation of `FluentBundle`.
+It uses the tooling parser above to read Fluent files.
+
+## `fluent.pygments`
+
+A [plugin for pygments](./fluent.pygments) to add syntax highlighting to Sphinx.
+
+## Discuss
+
+We’d love to hear your thoughts on Project Fluent! Whether you’re a
+localizer looking for a better way to express yourself in your language,
+or a developer trying to make your app localizable and multilingual, or
+a hacker looking for a project to contribute to, please do get in touch
+on the mailing list and the IRC channel.
+
+-  Mozilla Discourse: https://discourse.mozilla.org/c/fluent
+-  Matrix channel: [#fluent:mozilla.org](https://chat.mozilla.org/#/room/#fluent:mozilla.org)
+
+## Get Involved
+
+python-fluent is open-source, licensed under the Apache License, Version
+2.0. We encourage everyone to take a look at our code and we’ll listen
+to your feedback.

README.rst

@@ -0,0 +1,14 @@
+# fluent.runtime
+
+Use [Fluent](https://projectfluent.org/) to localize your Python application.
+It comes with a `Localization` class to use, based on an implementation of `FluentBundle`.
+It uses the parser from `fluent.syntax` to read Fluent files.
+
+```python
+from datetime import date
+l10n = DemoLocalization("today-is = Today is { $today }")
+val = l10n.format_value("today-is", { "today": date.today() })
+val # 'Today is Jun 16, 2018'
+```
+
+Find the full documentation at https://projectfluent.org/python-fluent/fluent.runtime/.

dev-requirements.txt

@@ -1,12 +1,12 @@
-from typing import Callable, Dict
+from typing import Callable
 
 from .types import FluentType, fluent_date, fluent_number
 
 NUMBER = fluent_number
 DATETIME = fluent_date
 
 
-BUILTINS: Dict[str, Callable[..., FluentType]] = {
+BUILTINS: dict[str, Callable[..., FluentType]] = {
     "NUMBER": NUMBER,
     "DATETIME": DATETIME,
 }

fluent.runtime/README.md

@@ -1,10 +1,9 @@
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Tuple, Union, cast
+from typing import TYPE_CHECKING, Any, Callable, Literal, Union, cast
 
 import babel
 import babel.numbers
 import babel.plural
 from fluent.syntax import ast as FTL
-from typing_extensions import Literal
 
 from .builtins import BUILTINS
 from .prepare import Compiler
@@ -34,16 +33,16 @@ class FluentBundle:
 
     def __init__(
         self,
-        locales: List[str],
-        functions: Union[Dict[str, Callable[..., "FluentType"]], None] = None,
+        locales: list[str],
+        functions: Union[dict[str, Callable[..., "FluentType"]], None] = None,
         use_isolating: bool = True,
     ):
         self.locales = locales
         self._functions = {**BUILTINS, **(functions or {})}
         self.use_isolating = use_isolating
-        self._messages: Dict[str, Union[FTL.Message, FTL.Term]] = {}
-        self._terms: Dict[str, Union[FTL.Message, FTL.Term]] = {}
-        self._compiled: Dict[str, Message] = {}
+        self._messages: dict[str, Union[FTL.Message, FTL.Term]] = {}
+        self._terms: dict[str, Union[FTL.Message, FTL.Term]] = {}
+        self._compiled: dict[str, Message] = {}
         # The compiler is not typed, and this cast is only valid for the public API
         self._compiler = cast(
             Callable[[Union[FTL.Message, FTL.Term]], Message], Compiler()
@@ -90,8 +89,8 @@ def _lookup(self, entry_id: str, term: bool = False) -> Message:
         return self._compiled[compiled_id]
 
     def format_pattern(
-        self, pattern: Pattern, args: Union[Dict[str, Any], None] = None
-    ) -> Tuple[Union[str, "FluentNone"], List[Exception]]:
+        self, pattern: Pattern, args: Union[dict[str, Any], None] = None
+    ) -> tuple[Union[str, "FluentNone"], list[Exception]]:
         if args is not None:
             fluent_args = {
                 argname: native_to_fluent(argvalue)
@@ -100,7 +99,7 @@ def format_pattern(
         else:
             fluent_args = {}
 
-        errors: List[Exception] = []
+        errors: list[Exception] = []
         env = ResolverEnvironment(
             context=self, current=CurrentEnvironment(args=fluent_args), errors=errors
         )