metaobjects 1.1.0__tar.gz → 1.1.1__tar.gz

{metaobjects-1.1.0 → metaobjects-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: metaobjects
-Version: 1.1.0
+Version: 1.1.1
 Summary: Cross-language metadata standard: declare typed entities once, generate idiomatic drift-checked code across languages — Python port.
 Project-URL: Homepage, https://metaobjects.dev
 Project-URL: Repository, https://github.com/metaobjectsdev/metaobjects
@@ -26,6 +26,7 @@ Requires-Dist: pyyaml>=6.0
 Provides-Extra: dev
 Requires-Dist: mypy>=1.10; extra == 'dev'
 Requires-Dist: pydantic>=2; extra == 'dev'
+Requires-Dist: pytest-xdist>=3.6; extra == 'dev'
 Requires-Dist: pytest>=8; extra == 'dev'
 Requires-Dist: ruff>=0.6; extra == 'dev'
 Provides-Extra: integration

{metaobjects-1.1.0 → metaobjects-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "metaobjects"
-version = "1.1.0"
+version = "1.1.1"
 description = "Cross-language metadata standard: declare typed entities once, generate idiomatic drift-checked code across languages — Python port."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -50,7 +50,7 @@ Issues = "https://github.com/metaobjectsdev/metaobjects/issues"
 Changelog = "https://github.com/metaobjectsdev/metaobjects/blob/main/CHANGELOG.md"
 
 [project.optional-dependencies]
-dev = ["pytest>=8", "mypy>=1.10", "ruff>=0.6", "pydantic>=2"]
+dev = ["pytest>=8", "pytest-xdist>=3.6", "mypy>=1.10", "ruff>=0.6", "pydantic>=2"]
 # On-demand cross-language conformance suites — persistence + api-contract.
 # pg8000 is pure-python so this extra installs cleanly without native deps;
 # the persistence harness shells out to the docker CLI directly (matches the
@@ -103,6 +103,9 @@ exclude = ["tests/codegen/golden/"]
 [dependency-groups]
 dev = [
     "pytest>=9.0.3",
+    # scripts/ci-local.sh and scripts/integration-test.sh run the suite with `-n`; serial,
+    # the ~4,000 tests were the longest step in the full local run.
+    "pytest-xdist>=3.6",
     # `uv run` installs THIS group (PEP 735), not [project.optional-dependencies].
     # The validator-parity corpus (tests/codegen/test_validation_conformance.py)
     # imports pydantic to exercise the generated Pydantic models, so it must be here

{metaobjects-1.1.0 → metaobjects-1.1.1}/src/metaobjects/codegen/format.py

@@ -4,6 +4,7 @@ Both passes read stdin / write stdout, so generated code is import-sorted AND
 formatted — i.e. `ruff check`- and `ruff format`-clean for downstream consumers."""
 from __future__ import annotations
 
+import functools
 import importlib.util
 import subprocess
 import sys
@@ -16,9 +17,26 @@ _STDIN_NAME = "generated.py"
 _RUFF_AVAILABLE = importlib.util.find_spec("ruff") is not None
 
 
+@functools.cache
+def _ruff_command() -> list[str]:
+    """The installed ruff package's own binary, resolved once.
+
+    ``python -m ruff`` starts a second interpreter only to exec this same binary, and
+    ``gen`` formats every emitted file twice: the interpreter start was ~90% of codegen
+    wall time (measured: 59 ms vs 6 ms a call). ``find_ruff_bin`` is ruff's documented
+    lookup for the binary its package installed, so the version — and the output — is
+    the one ``-m ruff`` would have run. Falls back to ``-m ruff`` if it cannot find it."""
+    try:
+        from ruff import find_ruff_bin
+
+        return [str(find_ruff_bin())]
+    except (ImportError, FileNotFoundError):
+        return [sys.executable, "-m", "ruff"]
+
+
 def _run_ruff(args: list[str], source: str) -> str:
     proc = subprocess.run(
-        [sys.executable, "-m", "ruff", *args],
+        [*_ruff_command(), *args],
         input=source,
         capture_output=True,
         text=True,

{metaobjects-1.1.0 → metaobjects-1.1.1}/tests/codegen/test_format.py

@@ -83,3 +83,19 @@ def test_nonzero_ruff_with_no_stderr_still_names_the_exit_code(monkeypatch) -> N
 
     assert "2" in msg
     assert not msg.rstrip().endswith(":")
+
+
+def test_ruff_runs_as_its_own_binary_not_through_a_second_interpreter() -> None:
+    """`python -m ruff` starts an interpreter only to exec ruff's binary, and gen runs
+    ruff twice per emitted file: that start was ~90% of codegen wall time. The command
+    must be the binary the installed ruff package ships, which is the same ruff."""
+    import pytest
+
+    import metaobjects.codegen.format as fmt
+    from ruff import find_ruff_bin
+
+    try:
+        binary = find_ruff_bin()
+    except FileNotFoundError:
+        pytest.skip("this ruff install ships no binary; format.py falls back to `-m ruff`")
+    assert fmt._ruff_command() == [str(binary)]

{metaobjects-1.1.0 → metaobjects-1.1.1}/tests/integration/mysql_container.py

@@ -11,7 +11,6 @@ against an existing server instead: the tests then OWN that database and drop ev
 from __future__ import annotations
 
 import os
-import socket
 import subprocess
 import time
 import uuid
@@ -20,6 +19,8 @@ from dataclasses import dataclass
 from typing import Any
 from urllib.parse import unquote, urlsplit
 
+from .postgres_container import published_port
+
 SHARED_MYSQL_URL_ENV = "METAOBJECTS_TEST_MYSQL_URL"
 
 
@@ -65,7 +66,6 @@ class MySqlContainer:
     DATABASE = "mo_test"
     USER = "root"
     PASSWORD = "test"
-    START_ATTEMPTS = 3
 
     def __init__(self) -> None:
         shared = os.environ.get(SHARED_MYSQL_URL_ENV)
@@ -79,31 +79,23 @@ class MySqlContainer:
             )
             return
         self._name = f"metaobjects-mysql-py-{uuid.uuid4().hex[:8]}"
-        last_failure: Exception | None = None
-        for _attempt in range(self.START_ATTEMPTS):
-            port = _pick_free_port()
-            self._info = MySqlInfo("localhost", port, self.DATABASE, self.USER, self.PASSWORD)
-            try:
-                _docker(
-                    "run", "-d", "--name", self._name,
-                    "-e", f"MYSQL_ROOT_PASSWORD={self.PASSWORD}",
-                    "-e", f"MYSQL_DATABASE={self.DATABASE}",
-                    "-p", f"{port}:3306", self.IMAGE,
-                )
-            except Exception as e:  # noqa: BLE001 -- docker refused the bind; retry on a new port
-                last_failure = e
-                self._force_remove()
-                continue
-            try:
-                self._wait_ready()
-                return
-            except Exception as e:  # noqa: BLE001 -- died on startup; retry on a new port
-                last_failure = e
-                self._force_remove()
-        raise RuntimeError(
-            f"mysql container '{self._name}' failed to start in {self.START_ATTEMPTS} attempts; "
-            f"last err: {last_failure}"
-        )
+        # Docker assigns the host port at bind time; see the port note in postgres_container.
+        try:
+            _docker(
+                "run", "-d", "--name", self._name,
+                "-e", f"MYSQL_ROOT_PASSWORD={self.PASSWORD}",
+                "-e", f"MYSQL_DATABASE={self.DATABASE}",
+                # Native AIO reserves ~17k kernel aio-nr slots per server; with the default
+                # fs.aio-max-nr (65536) parallel lanes exhaust it and InnoDB dies with EAGAIN
+                # at io_setup(). Buffered I/O is plenty for a test database.
+                "-p", "127.0.0.1::3306", self.IMAGE, "--innodb-use-native-aio=0",
+            )
+            port = published_port(self._name, 3306)
+            self._info = MySqlInfo("127.0.0.1", port, self.DATABASE, self.USER, self.PASSWORD)
+            self._wait_ready()
+        except BaseException:
+            self._force_remove()
+            raise
 
     def info(self) -> MySqlInfo:
         return self._info
@@ -168,9 +160,3 @@ def _docker(*args: str) -> str:
     if r.returncode != 0:
         raise subprocess.CalledProcessError(r.returncode, ["docker", *args], output=r.stdout, stderr=r.stderr)
     return r.stdout.strip()
-
-
-def _pick_free_port() -> int:
-    with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
-        s.bind(("127.0.0.1", 0))
-        return int(s.getsockname()[1])

{metaobjects-1.1.0 → metaobjects-1.1.1}/tests/integration/postgres_container.py

@@ -16,11 +16,9 @@ Two modes, mirroring the TS/Java/Kotlin/C# integration suites:
 from __future__ import annotations
 
 import os
-import socket
 import subprocess
 import time
 import uuid
-from contextlib import closing
 from dataclasses import dataclass
 from urllib.parse import urlsplit
 
@@ -43,8 +41,6 @@ class PostgresContainer:
 
     IMAGE = "postgres:16-alpine"
 
-    #: Fresh-port retries before giving up -- see the port-race note in __init__.
-    START_ATTEMPTS = 3
     USER = "postgres"
     PASSWORD = "test"
     DATABASE = "postgres"
@@ -60,45 +56,30 @@ class PostgresContainer:
         self._shared = False
         self._admin_url = None
         self._name = f"metaobjects-test-{uuid.uuid4().hex[:8]}"
-        # PORT RACE. _pick_free_port() closes its probe socket and hands the number to
-        # docker, which binds it LATER -- a check-then-act gap. Alone it never bites;
-        # under a full CI run several ports start containers at once and two can be
-        # handed the same number. The loser's container is created and then dies, and a
-        # readiness probe that only asks `docker exec` cannot tell that from a slow
-        # boot. Retry on a FRESH port.
+        # The host port is assigned by docker at bind time (``-p 127.0.0.1::5432``) and
+        # read back with ``docker port``. Picking a free port here, releasing it and
+        # handing the number to docker is a check-then-act race that parallel CI lanes lose.
         #
         # Deliberately NOT `--rm`: an auto-removed container takes its logs with it, so
-        # the one artefact explaining the failure vanishes exactly when it is needed.
+        # the one artefact explaining a failure vanishes exactly when it is needed.
         # close() force-removes, so nothing leaks.
-        last_failure: Exception | None = None
-        for _attempt in range(self.START_ATTEMPTS):
-            self._port = _pick_free_port()
+        try:
+            _docker(
+                "run", "-d",
+                "--name", self._name,
+                "-e", f"POSTGRES_PASSWORD={self.PASSWORD}",
+                "-p", "127.0.0.1::5432",
+                self.IMAGE,
+            )
+            self._port = published_port(self._name, 5432)
             self._info = PostgresInfo(
-                host="localhost", port=self._port, database=self.DATABASE,
+                host="127.0.0.1", port=self._port, database=self.DATABASE,
                 user=self.USER, password=self.PASSWORD,
             )
-            try:
-                _docker(
-                    "run", "-d",
-                    "--name", self._name,
-                    "-e", f"POSTGRES_PASSWORD={self.PASSWORD}",
-                    "-p", f"{self._port}:5432",
-                    self.IMAGE,
-                )
-            except Exception as e:  # noqa: BLE001 — docker refused the bind; retry on a new port
-                last_failure = e
-                self._force_remove()
-                continue
-            try:
-                self._wait_ready()
-                return
-            except Exception as e:  # noqa: BLE001 — died on startup; retry on a new port
-                last_failure = e
-                self._force_remove()
-        raise RuntimeError(
-            f"postgres container '{self._name}' failed to start in "
-            f"{self.START_ATTEMPTS} attempts; last err: {last_failure}"
-        )
+            self._wait_ready()
+        except BaseException:
+            self._force_remove()
+            raise
 
     # -- Shared-sidecar mode -------------------------------------------------
     # CREATE a fresh, uniquely-named database on the already-running Postgres
@@ -174,7 +155,7 @@ class PostgresContainer:
     # ready quickly (the loop polls every 250ms and returns immediately) and only
     # changes how long the pathological case takes to give up.
     def _force_remove(self) -> None:
-        """Best-effort teardown between start attempts."""
+        """Best-effort teardown of a container that failed to start."""
         try:
             _docker("rm", "-f", self._name)
         except Exception:  # noqa: BLE001 — already gone
@@ -218,7 +199,7 @@ class PostgresContainer:
             if ready.returncode == 0:
                 try:
                     conn = pg8000.dbapi.connect(
-                        host="localhost", port=self._port,
+                        host="127.0.0.1", port=self._port,
                         user=self.USER, password=self.PASSWORD, database=self.DATABASE,
                     )
                     conn.close()
@@ -243,7 +224,11 @@ def _docker(*args: str) -> str:
     return r.stdout.strip()
 
 
-def _pick_free_port() -> int:
-    with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
-        s.bind(("127.0.0.1", 0))
-        return int(s.getsockname()[1])
+def published_port(name: str, container_port: int) -> int:
+    """The host port docker assigned to *container_port* (``docker port`` prints ``127.0.0.1:<port>``)."""
+    out = _docker("port", name, f"{container_port}/tcp")
+    first = out.splitlines()[0] if out else ""
+    port = first.rsplit(":", 1)[-1].strip()
+    if not port.isdigit():
+        raise RuntimeError(f"docker port {name} {container_port}/tcp printed no port: {out!r}")
+    return int(port)

{metaobjects-1.1.0 → metaobjects-1.1.1}/uv.lock

@@ -104,6 +104,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
 ]
 
+[[package]]
+name = "execnet"
+version = "2.1.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bf/89/780e11f9588d9e7128a3f87788354c7946a9cbb1401ad38a48c4db9a4f07/execnet-2.1.2.tar.gz", hash = "sha256:63d83bfdd9a23e35b9c6a3261412324f964c2ec8dcd8d3c6916ee9373e0befcd", size = 166622, upload-time = "2025-11-12T09:56:37.75Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" },
+]
+
 [[package]]
 name = "fastapi"
 version = "0.136.3"
@@ -250,7 +259,7 @@ wheels = [
 
 [[package]]
 name = "metaobjects"
-version = "1.1.0"
+version = "1.1.1"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },
@@ -261,6 +270,7 @@ dev = [
     { name = "mypy" },
     { name = "pydantic" },
     { name = "pytest" },
+    { name = "pytest-xdist" },
     { name = "ruff" },
 ]
 integration = [
@@ -277,6 +287,7 @@ mysql = [
 dev = [
     { name = "pydantic" },
     { name = "pytest" },
+    { name = "pytest-xdist" },
     { name = "ruff" },
 ]
 
@@ -290,6 +301,7 @@ requires-dist = [
     { name = "pymysql", marker = "extra == 'integration'", specifier = ">=1.1" },
     { name = "pymysql", marker = "extra == 'mysql'", specifier = ">=1.1" },
     { name = "pytest", marker = "extra == 'dev'", specifier = ">=8" },
+    { name = "pytest-xdist", marker = "extra == 'dev'", specifier = ">=3.6" },
     { name = "pyyaml", specifier = ">=6.0" },
     { name = "ruff", marker = "extra == 'dev'", specifier = ">=0.6" },
 ]
@@ -299,6 +311,7 @@ provides-extras = ["dev", "integration", "mysql"]
 dev = [
     { name = "pydantic", specifier = ">=2" },
     { name = "pytest", specifier = ">=9.0.3" },
+    { name = "pytest-xdist", specifier = ">=3.6" },
     { name = "ruff", specifier = ">=0.6" },
 ]
 
@@ -553,6 +566,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" },
 ]
 
+[[package]]
+name = "pytest-xdist"
+version = "3.8.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "execnet" },
+    { name = "pytest" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/78/b4/439b179d1ff526791eb921115fca8e44e596a13efeda518b9d845a619450/pytest_xdist-3.8.0.tar.gz", hash = "sha256:7e578125ec9bc6050861aa93f2d59f1d8d085595d6551c2c90b6f4fad8d3a9f1", size = 88069, upload-time = "2025-07-01T13:30:59.346Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ca/31/d4e37e9e550c2b92a9cbc2e4d0b7420a27224968580b5a447f420847c975/pytest_xdist-3.8.0-py3-none-any.whl", hash = "sha256:202ca578cfeb7370784a8c33d6d05bc6e13b4f25b5053c30a152269fd10f0b88", size = 46396, upload-time = "2025-07-01T13:30:56.632Z" },
+]
+
 [[package]]
 name = "python-dateutil"
 version = "2.9.0.post0"