Merge pull request #1207 from pypa/main

sync main to develop

Author: RonnyPfannschmidt

.github/workflows/api-check.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/python-tests.yml

@@ -27,7 +27,7 @@ jobs:
       SETUPTOOLS_SCM_NO_LOCAL: "1"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -50,7 +50,7 @@ jobs:
 
     name: ${{ matrix.os }} - Python ${{ matrix.python_version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Setup python
@@ -92,7 +92,7 @@ jobs:
           git config --system gpg.program "C:\Program Files (x86)\gnupg\bin\gpg.exe"
         if: runner.os == 'Windows'
       - run: uv sync --group test --group docs --extra rich
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: Packages
           path: dist
@@ -114,7 +114,7 @@ jobs:
       id-token: write
     needs: [test]
     steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v5
       with:
         name: Packages
         path: dist
@@ -128,7 +128,7 @@ jobs:
     permissions:
       contents: write
     steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v5
       with:
         name: Packages
         path: dist
@@ -145,7 +145,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v5
       with:
         name: Packages
         path: dist

.gitignore

@@ -51,3 +51,5 @@ coverage.xml
 
 # Sphinx documentation
 docs/_build/
+
+.serena/cache/

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: check-yaml
     -   id: debug-statements
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.7
+  rev: v0.12.8
   hooks:
     - id: ruff-check
       args: [--fix, --exit-non-zero-on-fix, --show-fixes]
@@ -33,7 +33,7 @@ repos:
       - id: sp-repo-review
 
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
     -   id: codespell
         args: [-w, --ignore-words-list=hist,nd,te]

.serena/memories/done_checklist.md

@@ -0,0 +1,16 @@
+Before considering a task done
+
+- Code quality
+  - Ruff clean: uv run ruff check .
+  - Types clean: uv run mypy
+- Tests
+  - All tests green: uv run pytest
+  - New/changed behavior covered with tests (use project fixtures)
+- Docs
+  - Update docs if user-facing behavior changed
+  - Build docs cleanly: uv run mkdocs build --clean --strict
+- Packaging
+  - If relevant: uv run python -m build && uv run twine check dist/*
+- Housekeeping
+  - Follow existing naming and module structure; keep functions focused and typed
+  - Update `CHANGELOG.md` when appropriate

.serena/memories/project_overview.md

@@ -0,0 +1,28 @@
+Project: setuptools-scm
+
+Purpose
+- Extract and infer Python package versions from SCM metadata (Git/Mercurial) at build/runtime.
+- Provide setuptools integrations (dynamic version, file finders) and fallbacks for archival/PKG-INFO.
+
+Tech Stack
+- Language: Python (3.8–3.13)
+- Packaging/build: setuptools (>=61), packaging; console scripts via entry points
+- Tooling: uv (dependency and run), pytest, mypy (strict), ruff (lint, isort), mkdocs (docs), tox (optional/matrix), wheel/build
+
+Codebase Structure (high level)
+- src/setuptools_scm/: library code
+  - _cli.py, __main__.py: CLI entry (`python -m setuptools_scm`, `setuptools-scm`)
+  - git.py, hg.py, hg_git.py: VCS parsing
+  - _file_finders/: discover files for sdist
+  - _integration/: setuptools and pyproject integration
+  - version.py and helpers: version schemes/local version logic
+  - discover.py, fallbacks.py: inference and archival fallbacks
+- testing/: pytest suite and fixtures
+- docs/: mkdocs documentation
+- pyproject.toml: project metadata, pytest and ruff config
+- tox.ini: alternate CI/matrix, flake8 defaults
+- uv.lock: locked dependencies
+
+Conventions
+- Use uv to run commands (`uv run ...`); tests live under `testing/` per pytest config.
+- Type hints throughout; strict mypy enforced; ruff governs lint rules and import layout (isort in ruff).

.serena/memories/style_and_conventions.md

@@ -0,0 +1,17 @@
+Style and Conventions
+
+- Typing
+  - mypy strict is enabled; add precise type hints for public functions/classes.
+  - Prefer explicit/clear types; avoid `Any` and unsafe casts.
+- Linting/Imports
+  - Ruff is the canonical linter (config in pyproject). Respect its rules and isort settings (single-line imports, ordered, types grouped).
+  - Flake8 config exists in tox.ini but ruff linting is primary.
+- Formatting
+  - Follow ruff guidance; keep lines <= 88 where applicable (flake8 reference).
+- Testing
+  - Pytest with `testing/` as testpath; default 5m timeout; warnings treated as errors.
+  - Use existing fixtures; add `@pytest.mark` markers if needed (see pyproject markers).
+- Logging
+  - Tests run with log level info/debug; avoid noisy logs in normal library code.
+- General
+  - Small, focused functions; early returns; explicit errors. Keep APIs documented with concise docstrings.

.serena/memories/suggested_commands.md

@@ -0,0 +1,30 @@
+Environment
+- Install deps (uses default groups test, docs):
+  - uv sync
+
+Core Dev
+- Run tests:
+  - uv run pytest
+- Lint (ruff):
+  - uv run ruff check .
+  - uv run ruff check . --fix  # optional autofix
+- Type check (mypy strict):
+  - uv run mypy
+- Build docs:
+  - uv run mkdocs serve --dev-addr localhost:8000
+  - uv run mkdocs build --clean --strict
+
+Entrypoints / Tooling
+- CLI version/debug:
+  - uv run python -m setuptools_scm --help
+  - uv run python -m setuptools_scm
+  - uv run setuptools-scm --help
+- Build dist and verify:
+  - uv run python -m build
+  - uv run twine check dist/*
+- Optional matrix via tox:
+  - uv run tox -q
+
+Git/Linux Utilities (Linux host)
+- git status / git log --oneline --graph --decorate
+- ls -la; find . -name "pattern"; grep -R "text" .

.serena/project.yml

@@ -0,0 +1,68 @@
+# language of the project (csharp, python, rust, java, typescript, go, cpp, or ruby)
+#  * For C, use cpp
+#  * For JavaScript, use typescript
+# Special requirements:
+#  * csharp: Requires the presence of a .sln file in the project folder.
+language: python
+
+# whether to use the project's gitignore file to ignore files
+# Added on 2025-04-07
+ignore_all_files_in_gitignore: true
+# list of additional paths to ignore
+# same syntax as gitignore, so you can use * and **
+# Was previously called `ignored_dirs`, please update your config if you are using that.
+# Added (renamed)on 2025-04-07
+ignored_paths: []
+
+# whether the project is in read-only mode
+# If set to true, all editing tools will be disabled and attempts to use them will result in an error
+# Added on 2025-04-18
+read_only: false
+
+
+# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details.
+# Below is the complete list of tools for convenience.
+# To make sure you have the latest list of tools, and to view their descriptions,
+# execute `uv run scripts/print_tool_overview.py`.
+#
+#  * `activate_project`: Activates a project by name.
+#  * `check_onboarding_performed`: Checks whether project onboarding was already performed.
+#  * `create_text_file`: Creates/overwrites a file in the project directory.
+#  * `delete_lines`: Deletes a range of lines within a file.
+#  * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
+#  * `execute_shell_command`: Executes a shell command.
+#  * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
+#  * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
+#  * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
+#  * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
+#  * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file or directory.
+#  * `initial_instructions`: Gets the initial instructions for the current project.
+#     Should only be used in settings where the system prompt cannot be set,
+#     e.g. in clients you have no control over, like Claude Desktop.
+#  * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
+#  * `insert_at_line`: Inserts content at a given line in a file.
+#  * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
+#  * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
+#  * `list_memories`: Lists memories in Serena's project-specific memory store.
+#  * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
+#  * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
+#  * `read_file`: Reads a file within the project directory.
+#  * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
+#  * `remove_project`: Removes a project from the Serena configuration.
+#  * `replace_lines`: Replaces a range of lines within a file with new content.
+#  * `replace_symbol_body`: Replaces the full definition of a symbol.
+#  * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
+#  * `search_for_pattern`: Performs a search for a pattern in the project.
+#  * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
+#  * `switch_modes`: Activates modes by providing a list of their names
+#  * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
+#  * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
+#  * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
+#  * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
+excluded_tools: []
+
+# initial prompt for the project. It will always be given to the LLM upon activating the project
+# (contrary to the memories, which are loaded on demand).
+initial_prompt: ""
+
+project_name: "setuptools_scm"

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## v9.2.0
+
+### Added
+
+- add simplified activation via `setuptools-scm[simple]` extra
+
+  A new streamlined way to enable version inference without requiring a `[tool.setuptools_scm]` section.
+  When `setuptools-scm[simple]` is in `build-system.requires` and `version` is in `project.dynamic`,
+  version inference is automatically enabled with default settings.
+
+
+### removed
+
+- unchecked simplified activation - too many projects use setups where it would fail
+
+### changed
+
+- refine activation logic and add unittest for the relevant cases instead of trying to speedrun setuptools 
+
 ## v9.1.1
 
 ### fixed