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

ruff_sync-0.1.0.dev2/.agents/skills/release-notes-generation/SKILL.md

@@ -0,0 +1,82 @@
+---
+name: release-notes-generation
+description: Draft professional and categorized release notes for ruff-sync using GitHub CLI, git history, and the `invoke release` task.
+---
+
+# Release Notes Generation
+
+This skill guides you through drafting high-quality release notes for `ruff-sync`. It leverages the `invoke release` task and GitHub CLI for context.
+
+## Prerequisites
+
+- **GitHub CLI (`gh`)**: Must be authenticated.
+- **Invoke**: Dev tasks are defined in `tasks.py`.
+- **Git**: Recent history and tags must be available.
+
+## Workflow
+
+### 1. Gather Context
+
+Before drafting, understand what has changed since the last release.
+
+```bash
+# Get the latest release tag and notes
+gh release list --limit 1
+gh release view <tag>
+
+# List merged PRs since the last tag
+# Replace <tag> with the tag found above
+gh pr list --state merged --search "merged:><tag-date>"
+
+# Or simple git log
+git log <tag>..HEAD --oneline
+```
+
+### 2. Create Draft Release
+
+Use the project's built-in release task to scaffold the release. This task automatically tags the release based on the version in `pyproject.toml` and uses GitHub's `--generate-notes` feature to create a starting point.
+
+```bash
+# Create a draft release (default behavior of invoke release)
+uv run invoke release --draft --skip-tests
+```
+
+> [!NOTE]
+> `invoke release` will:
+> 1. Check if you are on `main`.
+> 2. Check for clean git state.
+> 3. Create a GitHub Release with `--generate-notes`.
+
+### 3. Refine Release Notes
+
+GitHub's automatically generated notes are a good start but often lack professional categorization and narrative. Use the following structure for final refinement:
+
+#### Categorization
+- **🚀 Features**: New capabilities added to `ruff_sync`.
+- **🐞 Bug Fixes**: Issues resolved in CLI, merging logic, or HTTP handling.
+- **✨ Improvements**: Enhancements to existing features, performance, or logging.
+- **📖 Documentation**: Updates to `README.md`, `docs/`, or docstrings.
+- **🛠️ Maintenance**: Dependency updates, CI changes, or test refactoring.
+
+#### Writing Style
+- Use clear, action-oriented language (e.g., "Add support...", "Fix issue where...", "Refactor...").
+- Link to PRs and contributors using their GitHub handles.
+- Include a "Breaking Changes" section if applicable (use `[!WARNING]` alerts).
+
+### 4. Finalize
+
+Once the notes are drafted and refined, you can view the draft on GitHub or update it via CLI.
+
+```bash
+# View the draft notes
+gh release view v<version>
+
+# Edit the draft (opens your editor)
+gh release edit v<version> --notes "your new notes"
+```
+
+## Tips
+
+- **Consistency**: Refer to the `AGENTS.md` for project-specific terminology (e.g., "Upstream Layers").
+- **Screenshots**: If the release includes significantly visible changes (e.g., new logging or CLI output formats), consider embedding a screenshot or recording in the notes.
+- **Automated Summary**: You can ask the AI assistant to "Draft release notes based on the git log since <tag>" to get a structured summary before applying it to the release.

{ruff_sync-0.1.0.dev1 → ruff_sync-0.1.0.dev2}/AGENTS.md

@@ -150,6 +150,7 @@ uv run coverage run -m pytest -vv
 - Use `pathlib` over `os.path` (enforced by `PTH` rules).
 - Prefer f-strings for logging (we ignore `G004`).
 - Do not create custom exception classes for simple errors (`TRY003` is ignored).
+- **Prefer `NamedTuple` for return types** over plain tuples to improve readability and type safety.
 
 ### TOML Handling
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruff-sync
-Version: 0.1.0.dev1
+Version: 0.1.0.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/
@@ -163,6 +163,7 @@ Run `ruff-sync --help` for full details on all available options.
 ## Key Features
 
 - 🏗️ **Format-preserving merges** — Uses [tomlkit](https://github.com/sdispater/tomlkit) under the hood, so your comments, whitespace, and TOML structure are preserved. No reformatting surprises.
+- 📂 **Upstream Layers** — Merge configurations from several sources sequentially (e.g., base company config + team-specific overrides).
 - 🌐 **GitHub & GitLab URL support** — Automatically converts GitHub/GitLab repository URLs, tree (directory) URLs, or blob (file) URLs to raw content URLs.
 - 🔍 **Smart configuration discovery** — Point at a directory and `ruff-sync` will automatically find your config. It checks `pyproject.toml`, `ruff.toml`, and `.ruff.toml` (in that order).
 - 📥 **Git clone support** — If the URL starts with `git@` or uses the `ssh://`, `git://`, or `git+ssh://` schemes, `ruff-sync` will perform an efficient shallow clone (using `--filter=blob:none` and `--no-checkout`) to safely extract the configuration with minimal network traffic.
@@ -200,8 +201,9 @@ Here are all the possible values that can be provided in `[tool.ruff-sync]` alon
 
 ```toml
 [tool.ruff-sync]
-# The source of truth URL for your Ruff configuration. (Required, unless passed via CLI)
-upstream = "https://github.com/my-org/standards"
+# The source of truth URL(s) for your Ruff configuration. (Required, unless passed via CLI)
+# Accepts a single string URL or a list of URLs.
+upstream = ["https://github.com/my-org/standards", "https://github.com/my-org/team-tweaks"]
 
 # A list of config keys to exclude from being synced. (Default: ["lint.per-file-ignores"])
 # Use simple names for top-level keys, and dotted paths for nested keys.
@@ -329,10 +331,13 @@ When you run `ruff-sync check`, it follows this process to determine if your pro
 ```mermaid
 flowchart TD
     Start([Start]) --> Local[Read Local Configuration]
-    Local --> Upstream[Download Upstream Configuration]
-    Upstream --> Extract[Extract tool.ruff section if needed]
+    Local --> Upstreams{For each Upstream}
+    Upstreams --> Download[Download/Clone Configuration]
+    Download --> Extract[Extract section if needed]
     Extract --> Exclude[Apply Exclusions]
-    Exclude --> Merge[Perform in-memory Merge]
+    Exclude --> Merge[Merge into in-memory Doc]
+    Merge --> Upstreams
+    Upstreams -- Done --> Comparison
 
     subgraph Comparison [Comparison Logic]
         direction TB

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

@@ -132,6 +132,7 @@ Run `ruff-sync --help` for full details on all available options.
 ## Key Features
 
 - 🏗️ **Format-preserving merges** — Uses [tomlkit](https://github.com/sdispater/tomlkit) under the hood, so your comments, whitespace, and TOML structure are preserved. No reformatting surprises.
+- 📂 **Upstream Layers** — Merge configurations from several sources sequentially (e.g., base company config + team-specific overrides).
 - 🌐 **GitHub & GitLab URL support** — Automatically converts GitHub/GitLab repository URLs, tree (directory) URLs, or blob (file) URLs to raw content URLs.
 - 🔍 **Smart configuration discovery** — Point at a directory and `ruff-sync` will automatically find your config. It checks `pyproject.toml`, `ruff.toml`, and `.ruff.toml` (in that order).
 - 📥 **Git clone support** — If the URL starts with `git@` or uses the `ssh://`, `git://`, or `git+ssh://` schemes, `ruff-sync` will perform an efficient shallow clone (using `--filter=blob:none` and `--no-checkout`) to safely extract the configuration with minimal network traffic.
@@ -169,8 +170,9 @@ Here are all the possible values that can be provided in `[tool.ruff-sync]` alon
 
 ```toml
 [tool.ruff-sync]
-# The source of truth URL for your Ruff configuration. (Required, unless passed via CLI)
-upstream = "https://github.com/my-org/standards"
+# The source of truth URL(s) for your Ruff configuration. (Required, unless passed via CLI)
+# Accepts a single string URL or a list of URLs.
+upstream = ["https://github.com/my-org/standards", "https://github.com/my-org/team-tweaks"]
 
 # A list of config keys to exclude from being synced. (Default: ["lint.per-file-ignores"])
 # Use simple names for top-level keys, and dotted paths for nested keys.
@@ -298,10 +300,13 @@ When you run `ruff-sync check`, it follows this process to determine if your pro
 ```mermaid
 flowchart TD
     Start([Start]) --> Local[Read Local Configuration]
-    Local --> Upstream[Download Upstream Configuration]
-    Upstream --> Extract[Extract tool.ruff section if needed]
+    Local --> Upstreams{For each Upstream}
+    Upstreams --> Download[Download/Clone Configuration]
+    Download --> Extract[Extract section if needed]
     Extract --> Exclude[Apply Exclusions]
-    Exclude --> Merge[Perform in-memory Merge]
+    Exclude --> Merge[Merge into in-memory Doc]
+    Merge --> Upstreams
+    Upstreams -- Done --> Comparison
 
     subgraph Comparison [Comparison Logic]
         direction TB

{ruff_sync-0.1.0.dev1 → ruff_sync-0.1.0.dev2}/docs/configuration.md

@@ -6,7 +6,7 @@
 
 | Key | Type | Default | Description |
 | :--- | :--- | :--- | :--- |
-| `upstream` | `str` | *Required* | The URL of the upstream `pyproject.toml` or `ruff.toml`. |
+| `upstream` | `str \| list[str]` | *Required* | The URL(s) of the upstream `pyproject.toml` or `ruff.toml`. |
 | `to` | `str` | `"."` | The local directory or file where configuration should be merged. |
 | `exclude` | `list[str]` | `["lint.per-file-ignores"]` | A list of configuration keys to preserve locally. |
 | `branch` | `str` | `"main"` | The default branch to use when resolving repository URLs. |
@@ -58,6 +58,18 @@ If your projects are on different Python versions but share linting rules:
 exclude = ["target-version"]
 ```
 
+#### Sequential merging of multiple sources
+
+You can specify multiple upstream sources as a list. They will be merged in order, with later sources overriding earlier ones.
+
+```toml
+[tool.ruff-sync]
+upstream = [
+    "https://github.com/my-org/shared-config",
+    "https://github.com/my-org/team-overrides",
+]
+```
+
 ## Deprecation Notes
 
 - The key `source` in `[tool.ruff-sync]` is deprecated and will be removed in a future version. Use `to` instead.

{ruff_sync-0.1.0.dev1 → ruff_sync-0.1.0.dev2}/docs/index.md

@@ -15,6 +15,7 @@
 * **⚡ Fast & Lightweight**: Zero-config needed for most projects.
 * **✨ Formatting Preserved**: Uses `tomlkit` to keep your comments, indentation, and whitespace exactly as they are.
 * **🛡️ Smart Merging**: Safely merges nested tables (like `lint.per-file-ignores`) without overwriting local overrides.
+* **📂 Upstream Layers**: Combine and merge configurations from several sources sequentially.
 * **🔗 Flexible Sources**: Sync from GitHub, GitLab, raw URLs, or local files.
 * **✅ CI Ready**: Built-in `check` command with semantic diffs for automated pipelines.
 

{ruff_sync-0.1.0.dev1 → ruff_sync-0.1.0.dev2}/docs/usage.md

@@ -9,10 +9,10 @@
 The `pull` command downloads the upstream configuration and merges it into your local file.
 
 ```bash
-ruff-sync pull [UPSTREAM_URL] [--to PATH] [--exclude KEY...] [--init]
+ruff-sync pull [UPSTREAM_URL...] [--to PATH] [--exclude KEY...] [--init]
 ```
 
-* **`UPSTREAM_URL`**: The URL to the source `pyproject.toml` or `ruff.toml`. Optional if defined in your local config.
+* **`UPSTREAM_URL...`**: One or more URLs to the source `pyproject.toml` or `ruff.toml`. Optional if defined in your local config.
 * **`--to`**: Where to save the merged config (defaults to `.`).
 * **`--exclude`**: Dotted paths of keys to keep local (e.g., `lint.isort`).
 * **`--init`**: Create a new `pyproject.toml` if it doesn't exist.
@@ -22,7 +22,7 @@ ruff-sync pull [UPSTREAM_URL] [--to PATH] [--exclude KEY...] [--init]
 The `check` command verifies if your local configuration matches the upstream one.
 
 ```bash
-ruff-sync check [UPSTREAM_URL] [--semantic] [--diff]
+ruff-sync check [UPSTREAM_URL...] [--semantic] [--diff]
 ```
 
 * **`--semantic`**: Ignore "non-functional" differences like whitespace, comments, or key order.
@@ -92,7 +92,9 @@ graph TD
     I --> L[Extract tool.ruff]
     K --> L
     L --> M[Apply Exclusions]
-    M --> N[Merge into local TOML]
-    N --> O[Save File]
+    M --> N[Merge into in-memory TOML]
+    N --> Loop{More Upstreams?}
+    Loop -- Yes --> F
+    Loop -- No --> O[Save File]
     O --> P[End]
 ```

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

@@ -1,6 +1,6 @@
 [project]
 name = "ruff-sync"
-version = "0.1.0.dev1"
+version = "0.1.0.dev2"
 description = "Synchronize Ruff linter configuration across projects"
 keywords = ["ruff", "linter", "config", "synchronize", "python", "linting", "automation", "tomlkit"]
 authors = [

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

@@ -44,7 +44,7 @@ __all__: Final[list[str]] = [
     "main",
 ]
 
-__version__ = "0.1.0.dev1"
+__version__ = "0.1.0.dev2"
 
 LOGGER = logging.getLogger(__name__)
 
@@ -79,7 +79,7 @@ class Arguments(NamedTuple):
     """CLI arguments for the ruff-sync tool."""
 
     command: str
-    upstream: URL
+    upstream: tuple[URL, ...]
     to: pathlib.Path
     exclude: Iterable[str]
     verbose: int
@@ -102,6 +102,16 @@ class Arguments(NamedTuple):
         return set(cls._fields) | {"source"}
 
 
+class ResolvedArgs(NamedTuple):
+    """Internal container for resolved arguments."""
+
+    upstream: tuple[URL, ...]
+    to: pathlib.Path
+    exclude: Iterable[str]
+    branch: str
+    path: str
+
+
 @lru_cache(maxsize=1)
 def get_config(
     source: pathlib.Path,
@@ -173,9 +183,9 @@ def _get_cli_parser() -> ArgumentParser:
     common_parser.add_argument(
         "upstream",
         type=URL,
-        nargs="?",
-        help=f"The URL to download the {RuffConfigFileName.PYPROJECT_TOML} file from."
-        " Optional if defined in [tool.ruff-sync].",
+        nargs="*",
+        help=f"One or more URLs to download the {RuffConfigFileName.PYPROJECT_TOML} file from."
+        " Optional if defined in [tool.ruff-sync]. Upstreams are merged sequentially.",
     )
     common_parser.add_argument(
         "--to",
@@ -253,20 +263,41 @@ def _get_cli_parser() -> ArgumentParser:
 PARSER: Final[ArgumentParser] = _get_cli_parser()
 
 
-def _resolve_upstream(args: Any, config: Mapping[str, Any]) -> URL:
-    """Resolve upstream URL from CLI or config."""
+def _resolve_upstream(args: Any, config: Mapping[str, Any]) -> tuple[URL, ...]:
+    """Resolve upstream URL(s) from CLI or config."""
     if args.upstream:
-        return cast("URL", args.upstream)
+        upstreams = tuple(cast("Iterable[URL]", args.upstream))
+        # Log CLI upstreams for consistency with config sourcing
+        summary = (
+            f"{upstreams[0]}... ({len(upstreams)} total)"
+            if len(upstreams) > 1
+            else str(upstreams[0])
+        )
+        LOGGER.info(f"📂 Using upstream(s) from CLI: {summary}")
+        return upstreams
     if "upstream" in config:
         config_upstream = config["upstream"]
-        if not isinstance(config_upstream, str):
-            PARSER.error(
-                "❌ upstream in [tool.ruff-sync] must be a string, "
-                f"got {type(config_upstream).__name__}"
-            )
-        upstream = URL(config_upstream)
-        LOGGER.info(f"📂 Using upstream from [tool.ruff-sync]: {upstream}")
-        return upstream
+        if isinstance(config_upstream, str):
+            upstream = (URL(config_upstream),)
+            LOGGER.info(f"📂 Using upstream from [tool.ruff-sync]: {upstream[0]}")
+            return upstream
+        if isinstance(config_upstream, list):
+            if not config_upstream:
+                PARSER.error("❌ [tool.ruff-sync].upstream list cannot be empty.")
+            if not all(isinstance(u, str) for u in config_upstream):
+                PARSER.error(
+                    "❌ all items in [tool.ruff-sync].upstream must be strings, "
+                    f"got {[type(u).__name__ for u in config_upstream]}"
+                )
+            upstreams = tuple(URL(u) for u in config_upstream)
+            LOGGER.info(f"📂 Using {len(upstreams)} upstreams from [tool.ruff-sync]")
+            return upstreams
+
+        PARSER.error(
+            "❌ upstream in [tool.ruff-sync] must be a string or a list of strings, "
+            f"got {type(config_upstream).__name__}"
+        )
+
     PARSER.error(
         "❌ the following arguments are required: upstream "
         f"(or define it in [tool.ruff-sync] in {RuffConfigFileName.PYPROJECT_TOML}) 💥"
@@ -323,16 +354,14 @@ def _resolve_to(args: Any, config: Mapping[str, Any], initial_to: pathlib.Path)
     return initial_to
 
 
-def _resolve_args(
-    args: Any, config: Mapping[str, Any], initial_to: pathlib.Path
-) -> tuple[URL, pathlib.Path, Iterable[str], str, str]:
+def _resolve_args(args: Any, config: Mapping[str, Any], initial_to: pathlib.Path) -> ResolvedArgs:
     """Resolve upstream, to, exclude, branch, and path from CLI and config."""
     upstream = _resolve_upstream(args, config)
     to = _resolve_to(args, config, initial_to)
     exclude = _resolve_exclude(args, config)
     branch = _resolve_branch(args, config)
     path = _resolve_path(args, config)
-    return upstream, to, exclude, branch, path
+    return ResolvedArgs(upstream, to, exclude, branch, path)
 
 
 def main() -> int:
@@ -372,7 +401,7 @@ def main() -> int:
     upstream, to_val, exclude, branch, path = _resolve_args(args, config, initial_to)
 
     # Convert non-raw github/gitlab upstream url to the raw equivalent
-    upstream = resolve_raw_url(upstream, branch=branch, path=path)
+    upstream = tuple(resolve_raw_url(u, branch=branch, path=path) for u in upstream)
 
     # Create Arguments object
     exec_args = Arguments(

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

@@ -95,7 +95,7 @@ class FetchResult(NamedTuple):
 class Config(TypedDict, total=False):
     """Configuration schema for [tool.ruff-sync] in pyproject.toml."""
 
-    upstream: str
+    upstream: str | list[str]
     to: str
     source: str  # Deprecated
     exclude: list[str]
@@ -107,12 +107,14 @@ class Config(TypedDict, total=False):
     init: bool
 
 
-def resolve_target_path(to: pathlib.Path, upstream_url: str | URL | None = None) -> pathlib.Path:
+def resolve_target_path(
+    to: pathlib.Path, upstreams: Iterable[str | URL] | None = None
+) -> pathlib.Path:
     """Resolve the target path for configuration files.
 
     If 'to' is a file, it's used directly.
     Otherwise, it looks for existing ruff/pyproject.toml in the 'to' directory.
-    If none found, it defaults to pyproject.toml unless the upstream is a ruff.toml.
+    If none found, it defaults to pyproject.toml unless the first upstream is a ruff.toml.
     """
     if to.is_file():
         return to
@@ -123,8 +125,11 @@ def resolve_target_path(to: pathlib.Path, upstream_url: str | URL | None = None)
         if candidate.exists():
             return candidate
 
+    # Use the first upstream URL as a hint for the default file name
+    first_upstream = next(iter(upstreams), None) if upstreams else None
+
     # If upstream is specified and is a ruff.toml, default to ruff.toml
-    if upstream_url and is_ruff_toml_file(upstream_url):
+    if first_upstream and is_ruff_toml_file(first_upstream):
         return to / RuffConfigFileName.RUFF_TOML
 
     return to / RuffConfigFileName.PYPROJECT_TOML
@@ -686,6 +691,34 @@ def merge_ruff_toml(
     return source
 
 
+async def _merge_multiple_upstreams(
+    target_doc: TOMLDocument,
+    is_target_ruff_toml: bool,
+    args: Arguments,
+    client: httpx.AsyncClient,
+) -> TOMLDocument:
+    """Sequentially fetch and merge all upstreams into the target document."""
+    for upstream_url in args.upstream:
+        fetch_result = await fetch_upstream_config(
+            upstream_url, client, branch=args.branch, path=args.path
+        )
+        LOGGER.info(f"Loaded upstream file from {fetch_result.resolved_upstream}")
+
+        is_upstream_ruff_toml = is_ruff_toml_file(fetch_result.resolved_upstream)
+
+        upstream_ruff_toml = get_ruff_config(
+            fetch_result.buffer.read(),
+            is_ruff_toml=is_upstream_ruff_toml,
+            create_if_missing=False,
+            exclude=args.exclude,
+        )
+
+        target_doc = merge_ruff_toml(
+            target_doc, upstream_ruff_toml, is_ruff_toml=is_target_ruff_toml
+        )
+    return target_doc
+
+
 async def check(
     args: Arguments,
 ) -> int:
@@ -720,30 +753,19 @@ async def check(
     source_toml_file = TOMLFile(_source_toml_path)
     source_doc = source_toml_file.read()
 
+    # Create a copy for comparison
+    source_doc_copy = tomlkit.parse(source_doc.as_string())
+    merged_doc = source_doc_copy
+
     async with httpx.AsyncClient() as client:
-        fetch_result = await fetch_upstream_config(
-            args.upstream, client, branch=args.branch, path=args.path
+        merged_doc = await _merge_multiple_upstreams(
+            merged_doc,
+            is_target_ruff_toml=is_ruff_toml_file(_source_toml_path.name),
+            args=args,
+            client=client,
         )
-        LOGGER.info(f"Loaded upstream file from {fetch_result.resolved_upstream}")
 
-    is_upstream_ruff_toml = is_ruff_toml_file(fetch_result.resolved_upstream)
     is_source_ruff_toml = is_ruff_toml_file(_source_toml_path.name)
-
-    upstream_ruff_toml = get_ruff_config(
-        fetch_result.buffer.read(),
-        is_ruff_toml=is_upstream_ruff_toml,
-        create_if_missing=False,
-        exclude=args.exclude,
-    )
-
-    # Create a copy for comparison
-    source_doc_copy = tomlkit.parse(source_doc.as_string())
-    merged_doc = merge_ruff_toml(
-        source_doc_copy,
-        upstream_ruff_toml,
-        is_ruff_toml=is_source_ruff_toml,
-    )
-
     if args.semantic:
         if is_source_ruff_toml:
             source_ruff = source_doc
@@ -837,28 +859,15 @@ async def pull(
         )
         return 1
 
-    # NOTE: there's no particular reason to use async here.
     async with httpx.AsyncClient() as client:
-        fetch_result = await fetch_upstream_config(
-            args.upstream, client, branch=args.branch, path=args.path
+        source_doc = await _merge_multiple_upstreams(
+            source_doc,
+            is_target_ruff_toml=is_ruff_toml_file(_source_toml_path.name),
+            args=args,
+            client=client,
         )
-        LOGGER.info(f"Loaded upstream file from {fetch_result.resolved_upstream}")
 
-    is_upstream_ruff_toml = is_ruff_toml_file(fetch_result.resolved_upstream)
-    is_source_ruff_toml = is_ruff_toml_file(_source_toml_path.name)
-
-    upstream_ruff_toml = get_ruff_config(
-        fetch_result.buffer.read(),
-        is_ruff_toml=is_upstream_ruff_toml,
-        create_if_missing=False,
-        exclude=args.exclude,
-    )
-    merged_toml = merge_ruff_toml(
-        source_doc,
-        upstream_ruff_toml,
-        is_ruff_toml=is_source_ruff_toml,
-    )
-    source_toml_file.write(merged_toml)
+    source_toml_file.write(source_doc)
     try:
         rel_path = _source_toml_path.resolve().relative_to(pathlib.Path.cwd())
     except ValueError:

ruff_sync-0.1.0.dev2/tests/lifecycle_tomls/multi_upstream_final.toml

@@ -0,0 +1,8 @@
+[tool.ruff]
+target-version = "py312"
+line-length = 100
+
+[tool.ruff.lint]
+select = ["E", "F", "I"]
+ignore = ["E501"]
+extend-select = ["UP"]

ruff_sync-0.1.0.dev2/tests/lifecycle_tomls/multi_upstream_initial.toml

@@ -0,0 +1,7 @@
+[tool.ruff]
+target-version = "py310"
+line-length = 88
+
+[tool.ruff.lint]
+select = ["E", "F"]
+ignore = ["E501"]

ruff_sync-0.1.0.dev2/tests/lifecycle_tomls/multi_upstream_up1.toml

@@ -0,0 +1,5 @@
+[tool.ruff]
+line-length = 100
+
+[tool.ruff.lint]
+select = ["E", "F", "I"]

ruff_sync-0.1.0.dev2/tests/lifecycle_tomls/multi_upstream_up2.toml

@@ -0,0 +1,5 @@
+[tool.ruff]
+target-version = "py312"
+
+[tool.ruff.lint]
+extend-select = ["UP"]