Skip to content

Commit 74cd4f3

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents 2ed5342 + 9c547e4 commit 74cd4f3

5 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/actions/poetry-install/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010

1111
outputs:
1212
cache-hit:
13-
description: Whether an exact cache hit occured
13+
description: Whether an exact cache hit occurred
1414
value: ${{ steps.cache.outputs.cache-hit }}
1515

1616
runs:

docs/pyproject.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,15 @@ Poetry is clever enough to detect Python subpackages.
699699
Thus, you only have to specify the directory where your root package resides.
700700
{{% /note %}}
701701

702+
{{% warning %}}
703+
If a VCS is being used, files matched by its ignore settings (for example, by
704+
`.gitignore` for Git) are excluded from the built distributions even when their
705+
parent directory is listed under `packages`. This can be surprising if a
706+
`packages` entry points at generated code or another path that is intentionally
707+
kept out of version control. To ship such files, add them back via
708+
[`include`]({{< relref "#exclude-and-include" >}}) with an explicit `format`.
709+
{{% /warning %}}
710+
702711
### exclude and include
703712

704713
{{% note %}}

src/poetry/vcs/git/backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def _normalise(self, remote_refs: FetchPackResult, repo: Repo) -> None:
147147

148148
def _set_head(self, remote_refs: FetchPackResult, repo: Repo) -> None:
149149
"""
150-
Internal helper method to populate ref and set it's sha as the remote's head
150+
Internal helper method to populate ref and set its SHA as the remote's head
151151
and default ref.
152152
"""
153153
self.ref = remote_refs.symrefs[Ref(b"HEAD")]
File renamed without changes.

tests/publishing/test_uploader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def test_uploader_properly_handles_nonstandard_errors(
156156
content = (
157157
b'{\n "errors": [ {\n '
158158
b'"status": 400,'
159-
b'"message": "I cant let you do that, dave"\n'
159+
b'"message": "I can\'t let you do that, dave"\n'
160160
b"} ]\n}"
161161
)
162162
http.post("https://foo.com", status=400, body=content)

0 commit comments

Comments
 (0)