Merge branch 'main' into docs-existing-project-usage

Author: nothing-991

.pre-commit-config.yaml

@@ -23,17 +23,17 @@ repos:
       - id: check-docstring-first
 
   - repo: https://github.com/pre-commit/pre-commit
-    rev: v4.5.0
+    rev: v4.5.1
     hooks:
       - id: validate_manifest
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.6
+    rev: v0.14.10
     hooks:
       - id: ruff-check
       - id: ruff-format
 
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.16.3
+    rev: v1.19.0
     hooks:
       - id: zizmor

docs/cli.md

@@ -711,9 +711,15 @@ poetry publish
 It can also build the package if you pass it the `--build` option.
 
 {{% note %}}
-See [Publishable Repositories]({{< relref "repositories/#publishable-repositories" >}}) for more information on how to configure and use publishable repositories.
+See [Publishable Repositories]({{< relref "repositories/#publishable-repositories" >}}) for more information
+on how to configure and use publishable repositories.
 {{% /note %}}
 
+{{% warning %}}
+Only artifacts of the latest version of your package in the dist directory will be uploaded.
+Older versions from previous builds as well as artifacts of other packages are ignored.
+{{% /warning %}}
+
 #### Options
 
 * `--repository (-r)`: The repository to register the package to (default: `pypi`).

docs/configuration.md

@@ -35,10 +35,15 @@ Your local configuration of Poetry application is stored in the `poetry.toml` fi
 which is separate from `pyproject.toml`.
 {{% /note %}}
 
-{{% warning %}}
-Be mindful about checking in this file into your repository since it may contain user-specific or sensitive information.
+{{% note %}}
+If a setting is defined in both `poetry.toml` (local/project) and `config.toml` (global),
+the local/project configuration takes precedence over the global configuration.
 {{% /note %}}
 
+{{% warning %}}
+Be mindful when checking in this file into your repository since it may contain user-specific or sensitive information.
+{{% /warning %}}
+
 ## Listing the current configuration
 
 To list the current configuration you can use the `--list` option

docs/plugins.md

@@ -263,13 +263,16 @@ in the `tool.poetry.requires-plugins` section of the pyproject.toml file:
 ```toml
 [tool.poetry.requires-plugins]
 my-application-plugin = ">1.0"
+custom-plugin = {path = "custom_plugin", develop = true}
 ```
 
 If the plugin is not installed in Poetry's own environment when running `poetry install`,
 it will be installed only for the current project under `.poetry/plugins`
 in the project's directory.
 
 The syntax to specify `plugins` is the same as for [dependencies]({{< relref "managing-dependencies" >}}).
+Plugins can be installed in editable mode using path dependencies with `develop = true`,
+which is useful for plugin development.
 
 {{% warning %}}
 You can even overwrite a plugin in Poetry's own environment with another version.

poetry.lock

@@ -4,11 +4,11 @@ version = "2.2.1"
 description = "Python dependency management and packaging made easy."
 requires-python = ">=3.10,<4.0"
 dependencies = [
-    "poetry-core (==2.2.1)",
+    "poetry-core @ git+https://github.com/python-poetry/poetry-core.git",
     "build (>=1.2.1,<2.0.0)",
     "cachecontrol[filecache] (>=0.14.0,<0.15.0)",
     "cleo (>=2.1.0,<3.0.0)",
-    "dulwich (>=0.24.0,<0.25.0)",
+    "dulwich (>=0.25.0,<0.26.0)",
     "fastjsonschema (>=2.18.0,<3.0.0)",
     "installer (>=0.7.0,<0.8.0)",
     "keyring (>=25.1.0,<26.0.0)",

pyproject.toml

@@ -82,8 +82,9 @@ def handle(self) -> int:
 
             self.call("build", args=f"--output {dist_dir}")
 
-        files = publisher.files
-        if not files:
+            publisher = Publisher(self.poetry, self.io, Path(dist_dir))
+
+        if not publisher.files:
             self.line_error(
                 "<error>No files to publish. "
                 "Run poetry build first or use the --build option.</error>"

src/poetry/console/commands/publish.py

@@ -29,11 +29,11 @@
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
-    from collections.abc import Mapping
     from collections.abc import Sequence
 
     from packaging.metadata import RawMetadata
     from packaging.utils import NormalizedName
+    from poetry.core.packages.package import PackageFile
     from poetry.core.packages.project_package import ProjectPackage
 
 
@@ -57,7 +57,7 @@ def __init__(
         summary: str | None = None,
         requires_dist: list[str] | None = None,
         requires_python: str | None = None,
-        files: Sequence[Mapping[str, str]] | None = None,
+        files: Sequence[PackageFile] | None = None,
         yanked: str | bool = False,
         cache_version: str | None = None,
     ) -> None:

src/poetry/inspection/info.py

@@ -420,7 +420,10 @@ def _get_locked_package(
             package.files = package_files
         elif "hashes" in metadata:
             hashes = cast("dict[str, Any]", metadata["hashes"])
-            package.files = [{"name": h, "hash": h} for h in hashes[name]]
+            # Strictly speaking, this is not correct,
+            # but we do not know the file names here,
+            # so we just set both file and hash.
+            package.files = [{"file": h, "hash": h} for h in hashes[name]]
         elif source_type in {"git", "directory", "url"}:
             package.files = []
         else:

src/poetry/packages/locker.py

@@ -9,6 +9,7 @@
 from functools import cached_property
 from importlib import metadata
 from pathlib import Path
+from site import addsitedir
 from typing import TYPE_CHECKING
 
 import tomlkit
@@ -62,7 +63,10 @@ def add_project_plugin_path(directory: Path) -> None:
 
         plugin_path = pyproject_toml.parent / ProjectPluginCache.PATH
         if plugin_path.exists():
+            # insert at the beginning to allow overriding dependencies
             EnvManager.get_system_env(naive=True).sys_path.insert(0, str(plugin_path))
+            # process .pth files (among other things)
+            addsitedir(str(plugin_path))
 
     @classmethod
     def ensure_project_plugins(cls, poetry: Poetry, io: IO) -> None: