messageformat2 0.1.0__tar.gz → 0.1.1__tar.gz

messageformat2-0.1.1/.github/dependabot.yml

@@ -0,0 +1,27 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "09:00"
+      timezone: "Europe/Zurich"
+    cooldown:
+      default-days: 7
+    groups:
+       github-actions:
+          patterns: ["*"]
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "09:00"
+      timezone: "Europe/Zurich"
+    cooldown:
+      default-days: 7
+    groups:
+       python-dependencies:
+          patterns: ["*"]

messageformat2-0.1.1/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.12", "3.13", "3.14"]
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install the latest version of uv and set the python version
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Lint code 🧹
+        run: |
+          uv run ruff check tests/ messageformat2/ --exclude messageformat2/cli.py
+
+      - name: Type check 🏷
+        run: |
+          uv run ty check messageformat2/ tests/
+
+      - name: Run tests 🧪
+        run: |
+          uv run pytest --no-cov --doctest-modules

messageformat2-0.1.1/.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Upload To PyPI
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  pypi-publish:
+
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Install the latest version of uv and set the python version
+      uses: astral-sh/setup-uv@v7
+      with:
+        python-version: '3.14'
+
+    - name: Build package 📦
+      run: uv build
+
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

{messageformat2-0.1.0 → messageformat2-0.1.1}/.gitignore

@@ -1,5 +1,4 @@
-venv/
-.python-version
+.venv/
 __pycache__/
 .coverage
 htmlcov/
@@ -7,4 +6,3 @@ htmlcov/
 .pytest_cache/
 *.egg-info/
 
-node_modules/

{messageformat2-0.1.0 → messageformat2-0.1.1}/.readthedocs.yaml

@@ -9,11 +9,11 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.12"
+  jobs:
+    post_create_environment:
+      - pip install uv
+    post_install:
+      - uv sync --group docs
 
 mkdocs:
   configuration: mkdocs.yml
-
-# Optionally declare the Python requirements required to build your docs
-python:
-  install:
-    - requirements: requirements.docs.txt

{messageformat2-0.1.0 → messageformat2-0.1.1}/CONTRIBUTING.md

@@ -24,6 +24,6 @@ pytest --doctest-modules
 ### Code quality
 
 ```sh
-pyright tests/ messageformat2/
+ty tests/ messageformat2/
 ruff check tests/ messageformat2/
 ```

{messageformat2-0.1.0 → messageformat2-0.1.1}/PKG-INFO

@@ -1,7 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: messageformat2
-Version: 0.1.0
+Version: 0.1.1
 Summary: Python implementation of Unicode MessageFormat 2.0
+Project-URL: Homepage, https://github.com/tomasr8/messageformat2
+Project-URL: Github, https://github.com/tomasr8/messageformat2
 Author-email: Tomas Roun <tomas.roun8@gmail.com>
 License: MIT License
         
@@ -24,10 +26,8 @@ License: MIT License
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
-        
-Project-URL: Homepage, https://github.com/tomasr8/messageformat2
-Project-URL: Github, https://github.com/tomasr8/messageformat2
-Keywords: i18n,internationalization,localization,messageformat,messageformat 2,cldr,gettext
+License-File: LICENSE
+Keywords: cldr,gettext,i18n,internationalization,localization,messageformat,messageformat 2
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -36,30 +36,13 @@ Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Internationalization
 Classifier: Topic :: Software Development :: Localization
 Requires-Python: >=3.12
+Requires-Dist: babel==2.17.0
+Requires-Dist: click==8.3.1
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: Babel
-Requires-Dist: click
-Provides-Extra: dev
-Requires-Dist: build; extra == "dev"
-Requires-Dist: twine; extra == "dev"
-Requires-Dist: uv; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-snapshot; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
-Requires-Dist: mkdocs; extra == "dev"
-Requires-Dist: mkdocstrings[python]; extra == "dev"
-Requires-Dist: mkdocs-material; extra == "dev"
-Provides-Extra: docs
-Requires-Dist: mkdocs; extra == "docs"
-Requires-Dist: mkdocstrings[python]; extra == "docs"
-Requires-Dist: mkdocs-material; extra == "docs"
-
-
-
-# MessageFormat2 [![Documentation Status](https://readthedocs.org/projects/messageformat2/badge/?version=latest)](https://messageformat2.readthedocs.io/en/latest/?badge=latest) [![CI](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg)](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg) [![Checked with pyright](https://microsoft.github.io/pyright/img/pyright_badge.svg)](https://microsoft.github.io/pyright/)
+
+
+
+# MessageFormat2 [![Documentation Status](https://readthedocs.org/projects/messageformat2/badge/?version=latest)](https://messageformat2.readthedocs.io/en/latest/?badge=latest) [![CI](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg)](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg)
 
 This is a Python implementation of the [Unicode Message Format 2.0
 specification](https://www.unicode.org/reports/tr35/tr35-72/tr35-messageFormat.html).

{messageformat2-0.1.0 → messageformat2-0.1.1}/README.md

@@ -1,6 +1,6 @@
 
 
-# MessageFormat2 [![Documentation Status](https://readthedocs.org/projects/messageformat2/badge/?version=latest)](https://messageformat2.readthedocs.io/en/latest/?badge=latest) [![CI](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg)](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg) [![Checked with pyright](https://microsoft.github.io/pyright/img/pyright_badge.svg)](https://microsoft.github.io/pyright/)
+# MessageFormat2 [![Documentation Status](https://readthedocs.org/projects/messageformat2/badge/?version=latest)](https://messageformat2.readthedocs.io/en/latest/?badge=latest) [![CI](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg)](https://github.com/tomasr8/messageformat2/workflows/CI/badge.svg)
 
 This is a Python implementation of the [Unicode Message Format 2.0
 specification](https://www.unicode.org/reports/tr35/tr35-72/tr35-messageFormat.html).

{messageformat2-0.1.0 → messageformat2-0.1.1}/docs/explanation.md

@@ -1,52 +1,8 @@
-This part of the project documentation focuses on an
-**understanding-oriented** approach. You'll get a
-chance to read about the background of the project,
-as well as reasoning about how it was implemented.
+## Runtime model
 
-> **Note:** Expand this section by considering the
-> following points:
-
-- Give context and background on your library
-- Explain why you created it
-- Provide multiple examples and approaches of how
-  to work with it
-- Help the reader make connections
-- Avoid writing instructions or technical descriptions
-  here
-
-Invalid syntax
-A complex message cannot start with leading whitespace. Such a message is treated as a simple message by the grammar
-
-## Whitespace
-
-This library implements the [grammar](https://www.unicode.org/reports/tr35/tr35-72/tr35-messageFormat.html#complete-abnf) exactly as specified which includes whitespace.
-According to the grammar, complex messages (messages containing declarations and/or the match block) cannot have a leading whitespace. For example, this message:
-
-```python
-    .match {$count :integer}
-* {{count is {$count}}}
-```
-
-will be parsed as a simple message (message not containing any declarations/match blocks, only patterns `{...}`). The parsing will fail
-because a pattern cannot contain unescaped `{`.
-
-When defining complex messages using multiline strings, don't forget to use a leading `\` to remove the first newline character:
-
-```python
-Message("""\  # <- notice the backslash
-.match {$count: integer}
-* {{count is {$count}}}""")
-```
-
-```python
-Message(""".match {$count: integer}
-* {{count is {$count}}}""")
-```
-
-## Computation model
-
-All expressions are lazily evaluated at the time of use. If the same variable if referenced more than once, it will be evaaluated more than once.
-IF you have formatters/selectors with side effects be careful.
+All expressions are lazily evaluated at the time of use.
+If the same variable is referenced more than once, it will also be evaluated more than once.
+Pay attention when providing custom formatters/selectors with side effects:
 
 ```python
 counter = 0
@@ -66,21 +22,50 @@ print(counter)  # -> 2
 
 ## Function composition
 
-Composition of functions is only allowed for the same functions i.e.
+Composition of functions is only allowed for the same functions:
 
 ```python
 .local $x {42 :integer}
 {{x = {$x :integer}}}
 ```
 
+This will raise an exception:
+
 ```python
 .local $x {42 :integer}
 {{x = {$x :string}}}
 ```
 
-Options are merged together with the later options overwritting any earlier options
+Options are merged together with the later options overwritting any earlier options:
 
 ```python
 .local $date {|2024-05-10| :date style=short}
 {{date = {$date :date style=full}}}
 ```
+
+## Whitespace
+
+This library implements the [grammar](https://www.unicode.org/reports/tr35/tr35-72/tr35-messageFormat.html#complete-abnf) exactly as specified which includes whitespace.
+According to the grammar, complex messages (messages containing declarations and/or the match block) cannot have a leading whitespace. For example, this message:
+
+```python
+    .match {$count :integer}
+* {{count is {$count}}}
+```
+
+will be parsed as a simple message (message not containing any declarations/match blocks, only patterns `{...}`). The parsing will fail because a pattern cannot contain unescaped `{`.
+
+When defining complex messages using multiline strings, don't forget to use a leading `\` to remove the first newline character:
+
+```python
+Message("""\  # <- notice the backslash
+.match {$count: integer}
+* {{count is {$count}}}""")
+```
+
+Alternatively, you can use this style:
+
+```python
+Message(""".match {$count: integer}
+* {{count is {$count}}}""")
+```

{messageformat2-0.1.0 → messageformat2-0.1.1}/docs/index.md

@@ -25,13 +25,3 @@ The `messageformat2` library includes:
 - Message extraction and loading - This will be provided once a format for MF2
   [message resources](https://github.com/eemeli/message-resource-wg) is
   standardized.
-
-## Table Of Contents
-
-1. [Tutorials](tutorials.md)
-2. [How-To Guides](how-to-guides.md)
-3. [Reference](reference.md)
-4. [Explanation](explanation.md)
-
-Quickly find what you're looking for depending on your use case by looking at
-the different pages.

{messageformat2-0.1.0 → messageformat2-0.1.1}/messageformat2/__init__.py

@@ -1,5 +1,5 @@
 from messageformat2.message import Message, format_message
 
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 __all__ = ["Message", "format_message"]

{messageformat2-0.1.0 → messageformat2-0.1.1}/messageformat2/builtins.py

@@ -150,7 +150,7 @@ def integer_selector(value: Any, locale: Locale, options: dict[str, Any], keys:
     return exact_keys + keyword_keys
 
 
-def format_datetime(  # noqa: PLR0915, PLR0913, PLR0912, C901
+def format_datetime(  # noqa: PLR0915, PLR0913
     dt: _datetime.datetime,
     locale: Locale,
     dateStyle: Literal["full", "long", "medium", "short"] | None = None,

{messageformat2-0.1.0 → messageformat2-0.1.1}/messageformat2/parser.py

@@ -165,7 +165,7 @@ def parse_simple_message(queue: Queue) -> PatternMessage:
     y = pattern[0]
     match (x, y):
         case (str(), str()):
-            pattern = simple_start[:-1] + [x + y] + pattern[1:]
+            pattern = [*simple_start[:-1], x + y, *pattern[1:]]
             return PatternMessage(declarations=[], pattern=pattern)
         case _:
             return PatternMessage(declarations=[], pattern=simple_start + pattern)

{messageformat2-0.1.0 → messageformat2-0.1.1}/messageformat2/runtime.py

@@ -165,7 +165,7 @@ def sort_variants(pref: list, variants: list[Variant]) -> Pattern:
         minpref = len(matches)
         for s in sortable:
             matchpref = minpref
-            key = s[1].keys[i]
+            key = s[1].keys[i]  # type: ignore[index]
             if not isinstance(key, CatchallKey):
                 assert isinstance(key, Literal)
                 ks = key.value
@@ -173,7 +173,7 @@ def sort_variants(pref: list, variants: list[Variant]) -> Pattern:
             s[0] = matchpref
         sortable.sort(key=lambda x: x[0])
         i = i - 1
-    return sortable[0][1].value
+    return sortable[0][1].value  # type: ignore[index]
 
 
 def resolve_selector(selector: Expression, ctx: FormattingContext) -> Any | LazyValue:

{messageformat2-0.1.0 → messageformat2-0.1.1}/pyproject.toml

@@ -23,24 +23,21 @@ classifiers = [
     "Topic :: Software Development :: Internationalization",
     "Topic :: Software Development :: Localization",
 ]
-dependencies = ["Babel", "click"]
+dependencies = ["Babel==2.17.0", "click==8.3.1"]
 dynamic = ["version"]
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
-    "build",
-    "twine",
-    "uv",
-    "pytest",
-    "pytest-snapshot",
-    "pytest-cov",
-    "ruff",
-    "pyright",
-    "mkdocs",
-    "mkdocstrings[python]",
-    "mkdocs-material",
+    "pytest==9.0.1",
+    "pytest-snapshot==0.9.0",
+    "pytest-cov==7.0.0",
+    "ruff==0.14.7",
+    "ty==0.0.1a30",
+    "mkdocs==1.6.1",
+    "mkdocstrings[python]==1.0.0",
+    "mkdocs-material==9.7.0",
 ]
-docs = ["mkdocs", "mkdocstrings[python]", "mkdocs-material"]
+docs = ["mkdocs==1.6.1", "mkdocstrings[python]==1.0.0", "mkdocs-material==9.7.0"]
 
 [project.urls]
 Homepage = "https://github.com/tomasr8/messageformat2"
@@ -49,19 +46,16 @@ Github = "https://github.com/tomasr8/messageformat2"
 [project.scripts]
 mf2 = "messageformat2.cli:cli"
 
-[tool.pyright]
-include = ["tests", "messageformat2"]
-
 [tool.ruff.lint]
 select = ["ALL"]
 ignore = [
     "D",
     "ANN002",
     "ANN003",
-    "ANN101",
     "ANN204",
     "ANN401",
     "COM812",
+    "C901",
     "BLE001",
     "RET503",
     "ISC001",
@@ -69,6 +63,7 @@ ignore = [
     "N803",
     "N806",
     "N818",
+    "PLR0912",
     "S101",
 ]
 
@@ -81,12 +76,12 @@ line-length = 120
 [tool.ruff.lint.isort]
 lines-after-imports = 2
 
-[tool.setuptools]
+[tool.hatch.build.targets.wheel]
 packages = ["messageformat2"]
 
-[tool.setuptools.dynamic]
-version = { attr = "messageformat2.__version__" }
+[tool.hatch.version]
+path = "messageformat2/__init__.py"
 
 [build-system]
-requires = ["setuptools", "setuptools-scm"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling==1.28.0"]
+build-backend = "hatchling.build"

{messageformat2-0.1.0 → messageformat2-0.1.1}/tests/test_parser.py

@@ -16,7 +16,7 @@ from messageformat2.parser import parse
 
 
 def ruff_format(source):
-    p = Popen(["ruff", "format", "-"], shell=False, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # noqa: S603, S607
+    p = Popen(["ruff", "format", "-"], shell=False, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # noqa: S607
     output, err = p.communicate(source.encode("utf-8"))
     assert not err
     return output