ruff-sync 0.1.7.dev1__tar.gz → 0.1.7.dev2__tar.gz

ruff_sync-0.1.7.dev2/.github/workflows/codspeed.yaml

@@ -0,0 +1,37 @@
+name: CodSpeed
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  # `workflow_dispatch` allows CodSpeed to trigger backtest
+  # performance analysis in order to generate initial data.
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  benchmarks:
+    name: Run benchmarks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python
+        run: uv python install 3.13
+
+      - name: Install dependencies
+        run: uv sync --group dev --frozen
+
+      - name: Run benchmarks
+        uses: CodSpeedHQ/action@v4
+        with:
+          mode: simulation
+          run: uv run pytest -m benchmark --codspeed

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruff-sync
-Version: 0.1.7.dev1
+Version: 0.1.7.dev2
 Summary: Synchronize Ruff linter configuration across projects
 Project-URL: Homepage, https://github.com/Kilo59/ruff-sync
 Project-URL: Documentation, https://kilo59.github.io/ruff-sync/
@@ -24,7 +24,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Quality Assurance
 Requires-Python: >=3.10
-Requires-Dist: httpx<1.0.0,>=0.27.0
+Requires-Dist: httpx2>=2.3.0
 Requires-Dist: tomlkit<2.0.0,>=0.12.3
 Requires-Dist: typing-extensions>=4.5.0
 Provides-Extra: tui
@@ -42,6 +42,7 @@ Description-Content-Type: text/markdown
   <a href="https://results.pre-commit.ci/latest/github/Kilo59/ruff-sync/main"><img src="https://results.pre-commit.ci/badge/github/Kilo59/ruff-sync/main.svg" alt="pre-commit.ci status"></a>
   <a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff"></a>
   <a href="https://wily.readthedocs.io/"><img src="https://img.shields.io/badge/%F0%9F%A6%8A%20wily-passing-brightgreen.svg" alt="Wily"></a>
+  <a href="https://codspeed.io/Kilo59/ruff-sync?utm_source=badge"><img src="https://img.shields.io/endpoint?url=https://codspeed.io/badge.json" alt="CodSpeed"/></a>
 </p>
 
 # ruff-sync

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/README.md

@@ -9,6 +9,7 @@
   <a href="https://results.pre-commit.ci/latest/github/Kilo59/ruff-sync/main"><img src="https://results.pre-commit.ci/badge/github/Kilo59/ruff-sync/main.svg" alt="pre-commit.ci status"></a>
   <a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff"></a>
   <a href="https://wily.readthedocs.io/"><img src="https://img.shields.io/badge/%F0%9F%A6%8A%20wily-passing-brightgreen.svg" alt="Wily"></a>
+  <a href="https://codspeed.io/Kilo59/ruff-sync?utm_source=badge"><img src="https://img.shields.io/endpoint?url=https://codspeed.io/badge.json" alt="CodSpeed"/></a>
 </p>
 
 # ruff-sync

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/docs/gen_ref_pages.py

@@ -7,7 +7,7 @@ import pathlib
 import mkdocs_gen_files
 from mkdocs_gen_files.nav import Nav
 
-nav = Nav()  # type: ignore[no-untyped-call]
+nav = Nav()
 
 for path in sorted(pathlib.Path("src").rglob("*.py")):
     module_path = path.relative_to("src").with_suffix("")

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ruff-sync"
-version = "0.1.7.dev1"
+version = "0.1.7.dev2"
 description = "Synchronize Ruff linter configuration across projects"
 keywords = ["ruff", "linter", "config", "synchronize", "python", "linting", "automation", "tomlkit", "pre-commit"]
 authors = [
@@ -24,7 +24,7 @@ classifiers = [
     "Topic :: Software Development :: Quality Assurance",
 ]
 dependencies = [
-    "httpx>=0.27.0,<1.0.0",
+    "httpx2>=2.3.0",
     "tomlkit>=0.12.3,<2.0.0",
     "typing-extensions>=4.5.0",
 ]
@@ -54,9 +54,10 @@ dev = [
     "pyfakefs>=5.4.1",
     "pytest>=8.0.0",
     "pytest-asyncio>=0.23.5",
+    "pytest-codspeed>=4.3.0",
     "pytest-icdiff>=0.9",
     "pytest-textual-snapshot>=1.0.0",
-    "respx>=0.21.1",
+    "pytest-httpx2",
     "ruamel-yaml>=0.18.6",
     "ruff>=0.15.0",
     "textual>=8.2.2",
@@ -99,6 +100,10 @@ exclude = 'site/.*'
 module = "tests.*"
 disable_error_code = ['type-arg', 'no-untyped-def']
 
+[[tool.mypy.overrides]]
+module = "ruff_sync.core"
+disable_error_code = ["union-attr", "unused-ignore"]
+
 [tool.ruff-sync]
 upstream = "https://github.com/Kilo59/ruff-sync/"
 to = "pyproject.toml"
@@ -231,6 +236,7 @@ docstring-code-line-length = "dynamic"
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 "unittest.mock".msg = "Prefer dedicated libraries to mock at external dependencies, such as `httpx` or `pyfakefs`."
 "typing.cast".msg = "Please fix the underlying type issues instead of using typing.cast."
+"httpx".msg = "Use httpx2 instead."
 
 [tool.ruff.lint.flake8-import-conventions]
 # Declare the banned `from` imports.
@@ -241,6 +247,7 @@ banned-from = ["pathlib", "datetime"]
 datetime = "dt"
 "pprint.pprint" = "pp"
 "pprint.pformat" = "pf"
+httpx2 = "httpx"
 
 [tool.ruff.lint.isort]
 required-imports = ["from __future__ import annotations"]
@@ -249,4 +256,9 @@ required-imports = ["from __future__ import annotations"]
 include = ["src/ruff_sync/*.py"]
 
 [tool.pytest]
+addopts = ["-p pytest_httpx2"]
 log_level = "INFO"
+markers = [
+    "benchmark: marks performance benchmarks (run separately for CodSpeed)",
+    "httpx2: configure the httpx2_mock fixture",
+]

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/src/ruff_sync/cli.py

@@ -24,7 +24,7 @@ from typing import (
 )
 
 import tomlkit
-from httpx import URL
+from httpx2 import URL
 from typing_extensions import deprecated, override
 
 from ruff_sync.constants import (

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/src/ruff_sync/config_io.py

@@ -13,7 +13,7 @@ from tomlkit.items import Table
 from typing_extensions import override
 
 if TYPE_CHECKING:
-    from httpx import URL
+    from httpx2 import URL
 
 
 @enum.unique

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/src/ruff_sync/core.py

@@ -22,9 +22,9 @@ from typing import (
     overload,
 )
 
-import httpx
+import httpx2 as httpx
 import tomlkit
-from httpx import URL
+from httpx2 import URL
 from tomlkit import TOMLDocument, table
 from tomlkit.items import Item, Table
 from tomlkit.toml_file import TOMLFile
@@ -330,12 +330,13 @@ def _get_discovery_candidates(base: pathlib.Path) -> list[pathlib.Path]: ...
 def _get_discovery_candidates(base: URL | pathlib.Path) -> list[URL] | list[pathlib.Path]:
     """Return a list of candidate configuration files, prioritizing the requested one."""
     # If it's a URL, use PurePosixPath. If it's a Path, use it directly.
-    name = base.path if isinstance(base, URL) else base.name
+    is_url = not isinstance(base, pathlib.Path)
+    name = base.path if is_url else base.name
     if pathlib.PurePosixPath(name).name != RuffConfigFileName.PYPROJECT_TOML:
         return [base]  # type: ignore[return-value]
 
     # Try pyproject.toml first, then fall back to ruff.toml variants.
-    if isinstance(base, URL):
+    if is_url:
         base_url = base.join(".")
         return [base] + [
             base_url.join(str(f))
@@ -935,7 +936,7 @@ async def check(
     Examples:
         >>> import asyncio
         >>> from ruff_sync.cli import Arguments
-        >>> from httpx import URL
+        >>> from httpx2 import URL
         >>> import pathlib
         >>> args = Arguments(
         ...     command="check",
@@ -1122,7 +1123,7 @@ async def pull(
     Examples:
         >>> import asyncio
         >>> from ruff_sync.cli import Arguments
-        >>> from httpx import URL
+        >>> from httpx2 import URL
         >>> import pathlib
         >>> args = Arguments(
         ...     command="pull",

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/tasks.py

@@ -14,7 +14,7 @@ import os
 import pathlib
 from typing import TYPE_CHECKING, Final, Literal
 
-import httpx
+import httpx2 as httpx
 from invoke.exceptions import Exit
 from invoke.tasks import task
 from packaging.version import Version

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/tests/conftest.py

@@ -3,11 +3,24 @@ from __future__ import annotations
 import logging
 import os
 import sys
-from typing import Literal, Protocol, runtime_checkable
+from typing import TYPE_CHECKING, Literal, Protocol, runtime_checkable
+
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+import contextlib
 
 import pytest
+import respx
+import truststore
+from respx.router import DEFAULT as RESPX_DEFAULT
+from respx.router import MockRouter
 from typing_extensions import override
 
+with contextlib.suppress(Exception):
+    truststore.SSLContext()
+
+
 import ruff_sync
 
 LOGGER = logging.getLogger(__name__)
@@ -38,7 +51,7 @@ class TestStreamHandler(logging.Handler):
 
 
 @pytest.fixture
-def configure_logging():
+def configure_logging() -> Generator[logging.Logger, None, None]:
     """Configure ruff_sync logger for tests to ensure capsys can capture log output."""
     logger = logging.getLogger("ruff_sync")
     old_handlers = logger.handlers[:]
@@ -62,7 +75,7 @@ def configure_logging():
 
 
 @pytest.fixture
-def clear_ruff_sync_caches():
+def clear_ruff_sync_caches() -> None:
     """Clear all lru_caches in ruff_sync."""
     ruff_sync.get_config.cache_clear()
     ruff_sync.Arguments.fields.cache_clear()
@@ -137,3 +150,43 @@ def cli_run(
         return exit_code, captured.out, captured.err
 
     return _run
+
+
+class HTTPX2MockRouter(MockRouter):
+    @override
+    def __call__(
+        self,
+        func=None,
+        *,
+        assert_all_called=None,
+        assert_all_mocked=None,
+        base_url=None,
+        using=RESPX_DEFAULT,
+    ):
+        """Override __call__ to set using='httpcore2' by default for nested mocks."""
+        if using is RESPX_DEFAULT:
+            using = "httpcore2"
+        return super().__call__(
+            func=func,
+            assert_all_called=assert_all_called,
+            assert_all_mocked=assert_all_mocked,
+            base_url=base_url,
+            using=using,
+        )
+
+
+@pytest.fixture
+def httpx2_mock(request: pytest.FixtureRequest) -> Generator[respx.Router, None, None]:
+    options = {}
+    if (marker := request.node.get_closest_marker("httpx2")) is not None:
+        options.update(marker.kwargs)
+    options.setdefault("using", "httpcore2")
+    router = HTTPX2MockRouter(**options)
+    with router:
+        yield router
+
+
+@pytest.fixture
+def respx_mock(httpx2_mock):
+    """Fixture that maps respx_mock to httpx2_mock for httpx2 compatibility."""
+    return httpx2_mock

{ruff_sync-0.1.7.dev1 → ruff_sync-0.1.7.dev2}/tests/test_basic.py

@@ -11,12 +11,13 @@ import sys
 from pprint import pformat as pf
 from typing import TYPE_CHECKING, Any, Final, NamedTuple, cast
 
-import httpx
+import httpx as original_httpx
+import httpx2 as httpx
 import pytest
 import respx
 import tomlkit
 from dirty_equals import IsPartialDict
-from httpx import URL
+from httpx2 import URL
 from pytest import param
 from tomlkit import TOMLDocument, document
 from tomlkit.items import Table
@@ -279,14 +280,14 @@ def test_merge_ruff_toml(source: str, toml_s: str, sep_str: str):
 
 
 @pytest.fixture
-def mock_http(toml_s: str) -> Generator[respx.MockRouter, None, None]:
-    with respx.mock(base_url="https://example.com/") as respx_mock:
-        respx_mock.get("/pyproject.toml").respond(
+def mock_http(toml_s: str, respx_mock: respx.MockRouter) -> Generator[respx.MockRouter, None, None]:
+    with respx_mock(base_url="https://example.com/") as mock:
+        mock.get("/pyproject.toml").respond(
             200,
             content_type="text/plain",
             content=toml_s,
         )
-        yield respx_mock
+        yield mock
 
 
 @pytest.fixture
@@ -596,7 +597,7 @@ def test_verbosity_log_level(
 
 
 @pytest.mark.asyncio
-async def test_sync_default_exclude(fs: FakeFilesystem):
+async def test_sync_default_exclude(fs: FakeFilesystem, respx_mock: respx.MockRouter):
     """Integration style test for default exclude functionality."""
     source_toml = """[tool.ruff]
 target-version = "py310"
@@ -609,8 +610,8 @@ target-version = "py311"
     ff = fs.create_file("pyproject.toml", contents=source_toml)
     ff_path = pathlib.Path(ff.path)  # type: ignore[arg-type]
 
-    with respx.mock(base_url="https://example.com/") as respx_mock:
-        respx_mock.get("/pyproject.toml").respond(
+    with respx_mock(base_url="https://example.com/") as mock:
+        mock.get("/pyproject.toml").respond(
             200,
             content_type="text/plain",
             content=upstream_toml,
@@ -684,12 +685,8 @@ async def test_merge_multiple_upstreams_preserves_order(respx_mock: respx.Router
     )
 
     # Mock HTTP responses using respx
-    respx_mock.get("http://one.toml").return_value = httpx.Response(
-        200, text="[tool.ruff]\nline-length = 80"
-    )
-    respx_mock.get("http://two.toml").return_value = httpx.Response(
-        200, text="[tool.ruff]\nline-length = 100"
-    )
+    respx_mock.get("http://one.toml").respond(200, text="[tool.ruff]\nline-length = 80")
+    respx_mock.get("http://two.toml").respond(200, text="[tool.ruff]\nline-length = 100")
 
     async with httpx.AsyncClient() as client:
         result_doc = await _merge_multiple_upstreams(target_doc, False, args.resolve(), client)
@@ -708,17 +705,17 @@ async def test_fetch_upstreams_concurrently_verified(respx_mock: respx.Router):
     """Verify that fetch_upstreams_concurrently actually runs tasks in parallel."""
     events = []
 
-    async def side_effect_one(request: httpx.Request) -> httpx.Response:
+    async def side_effect_one(request: original_httpx.Request) -> original_httpx.Response:
         events.append("start_one")
         await asyncio.sleep(0.05)
         events.append("end_one")
-        return httpx.Response(200, text="[tool.ruff]\n")
+        return original_httpx.Response(200, text="[tool.ruff]\n")
 
-    async def side_effect_two(request: httpx.Request) -> httpx.Response:
+    async def side_effect_two(request: original_httpx.Request) -> original_httpx.Response:
         events.append("start_two")
         await asyncio.sleep(0.05)
         events.append("end_two")
-        return httpx.Response(200, text="[tool.ruff]\n")
+        return original_httpx.Response(200, text="[tool.ruff]\n")
 
     respx_mock.get("http://one.toml").mock(side_effect=side_effect_one)
     respx_mock.get("http://two.toml").mock(side_effect=side_effect_two)
@@ -771,10 +768,8 @@ async def test_merge_multiple_upstreams_handles_errors(respx_mock: respx.Router)
     )
 
     # Mock HTTP responses using respx
-    respx_mock.get("http://ok.toml").return_value = httpx.Response(
-        200, text="[tool.ruff]\nline-length = 80"
-    )
-    respx_mock.get("http://fail.toml").return_value = httpx.Response(404)
+    respx_mock.get("http://ok.toml").respond(200, text="[tool.ruff]\nline-length = 80")
+    respx_mock.get("http://fail.toml").respond(404)
 
     async with httpx.AsyncClient() as client:
         with pytest.raises(UpstreamError) as excinfo: