Skip to content

Commit 69a76ed

Browse files
authored
Pin poetry version below <2 (#5782)
Force `poetry` version below 2 to avoid it mangling file modification times in `sdist`. Fixes #5770
2 parents b92a1b3 + 80cf9ea commit 69a76ed

File tree

8 files changed

+182
-332
lines changed

8 files changed

+182
-332
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v4
2323
- name: Install Python tools
24-
uses: BrandonLWhite/pipx-install-action@v0.1.1
24+
uses: BrandonLWhite/pipx-install-action@v1.0.1
2525
- name: Setup Python with poetry caching
2626
# poetry cache requires poetry to already be installed, weirdly
2727
uses: actions/setup-python@v5

.github/workflows/integration_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v4
1111
- name: Install Python tools
12-
uses: BrandonLWhite/pipx-install-action@v0.1.1
12+
uses: BrandonLWhite/pipx-install-action@v1.0.1
1313
- uses: actions/setup-python@v5
1414
with:
1515
python-version: 3.9

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
steps:
5454
- uses: actions/checkout@v4
5555
- name: Install Python tools
56-
uses: BrandonLWhite/pipx-install-action@v0.1.1
56+
uses: BrandonLWhite/pipx-install-action@v1.0.1
5757
- uses: actions/setup-python@v5
5858
with:
5959
python-version: ${{ env.PYTHON_VERSION }}
@@ -74,7 +74,7 @@ jobs:
7474
steps:
7575
- uses: actions/checkout@v4
7676
- name: Install Python tools
77-
uses: BrandonLWhite/pipx-install-action@v0.1.1
77+
uses: BrandonLWhite/pipx-install-action@v1.0.1
7878
- uses: actions/setup-python@v5
7979
with:
8080
python-version: ${{ env.PYTHON_VERSION }}
@@ -94,7 +94,7 @@ jobs:
9494
steps:
9595
- uses: actions/checkout@v4
9696
- name: Install Python tools
97-
uses: BrandonLWhite/pipx-install-action@v0.1.1
97+
uses: BrandonLWhite/pipx-install-action@v1.0.1
9898
- uses: actions/setup-python@v5
9999
with:
100100
python-version: ${{ env.PYTHON_VERSION }}
@@ -118,7 +118,7 @@ jobs:
118118
steps:
119119
- uses: actions/checkout@v4
120120
- name: Install Python tools
121-
uses: BrandonLWhite/pipx-install-action@v0.1.1
121+
uses: BrandonLWhite/pipx-install-action@v1.0.1
122122
- uses: actions/setup-python@v5
123123
with:
124124
python-version: ${{ env.PYTHON_VERSION }}

.github/workflows/make_release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Install Python tools
22-
uses: BrandonLWhite/pipx-install-action@v0.1.1
22+
uses: BrandonLWhite/pipx-install-action@v1.0.1
2323
- uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ env.PYTHON_VERSION }}
@@ -50,7 +50,7 @@ jobs:
5050
ref: ${{ env.NEW_TAG }}
5151

5252
- name: Install Python tools
53-
uses: BrandonLWhite/pipx-install-action@v0.1.1
53+
uses: BrandonLWhite/pipx-install-action@v1.0.1
5454
- uses: actions/setup-python@v5
5555
with:
5656
python-version: ${{ env.PYTHON_VERSION }}

CONTRIBUTING.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ Install `poetry`_ and `poethepoet`_ using `pipx`_::
8787

8888
$ pipx install poetry poethepoet
8989

90+
.. admonition:: Check ``tool.pipx-install`` section in ``pyproject.toml`` to
91+
see supported versions
92+
93+
::
94+
95+
[tool.pipx-install]
96+
poethepoet = ">=0.26"
97+
poetry = "<2"
98+
9099
.. _pipx: https://pipx.pypa.io/stable
91100
.. _pipx-installation-instructions: https://pipx.pypa.io/stable/installation/
92101

docs/changelog.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ Changelog goes here! Please add your entry to the bottom of one of the lists bel
66
Unreleased
77
----------
88

9-
New features:
10-
119
Bug fixes:
12-
1310
* :doc:`/reference/pathformat`: Fixed a regression where path legalization
1411
incorrectly removed parts of user-configured path formats that followed a dot
1512
(**.**).
1613
:bug:`5771`
1714

1815
For packagers:
19-
20-
Other changes:
16+
* Force ``poetry`` version below 2 to avoid it mangling file modification times
17+
in ``sdist`` package.
18+
:bug:`5770`
2119

2220
2.3.0 (May 07, 2025)
2321
--------------------
@@ -115,8 +113,8 @@ Other changes:
115113
:bug:`5539`
116114
* :doc:`/plugins/smartplaylist`: URL-encode additional item `fields` within generated
117115
EXTM3U playlists instead of JSON-encoding them.
118-
* typehints: `./beets/importer.py` file now has improved typehints.
119-
* typehints: `./beets/plugins.py` file now includes typehints.
116+
* typehints: `./beets/importer.py` file now has improved typehints.
117+
* typehints: `./beets/plugins.py` file now includes typehints.
120118
* :doc:`plugins/ftintitle`: Optimize the plugin by avoiding unnecessary writes
121119
to the database.
122120
* Database models are now serializable with pickle.

0 commit comments

Comments
 (0)