Skip to content

Commit 242d0e8

Browse files
authored
Include tests and manual in sdist and update dependencies, and include changelog to the release (#5520)
* Fixes #5513 * Fixes #5518 This PR adds the `test` folder and manuals to the package source tarball and upgrades the dependencies to fix a few vulnerabilities. I also added a fix for the changelog not making it to the release notes.
2 parents 0eab8b6 + f39eb98 commit 242d0e8

File tree

5 files changed

+598
-498
lines changed

5 files changed

+598
-498
lines changed

.github/workflows/make_release.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
name: Get changelog and build the distribution package
4141
runs-on: ubuntu-latest
4242
needs: increment-version
43+
outputs:
44+
changelog: ${{ steps.generate_changelog.outputs.changelog }}
4345
steps:
4446
- uses: actions/checkout@v4
4547
with:
@@ -53,12 +55,13 @@ jobs:
5355
cache: poetry
5456

5557
- name: Install dependencies
56-
run: poetry install --only=release
58+
run: poetry install --with=release --extras=docs
5759

5860
- name: Install pandoc
5961
run: sudo apt update && sudo apt install pandoc -y
6062

6163
- name: Obtain the changelog
64+
id: generate_changelog
6265
run: |
6366
{
6467
echo 'changelog<<EOF'
@@ -67,7 +70,7 @@ jobs:
6770
} >> "$GITHUB_OUTPUT"
6871
6972
- name: Build a binary wheel and a source tarball
70-
run: poetry build
73+
run: poe build
7174

7275
- name: Store the distribution packages
7376
uses: actions/upload-artifact@v4

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
repos:
55
- repo: https://github.com/astral-sh/ruff-pre-commit
6-
rev: v0.6.6
6+
rev: v0.8.0
77
hooks:
88
- id: ruff-format

docs/changelog.rst

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ Bug fixes:
2020
* Fix bug where matcher doesn't consider medium number when importing. This makes
2121
it difficult to import hybrid SACDs and other releases with duplicate tracks.
2222
:bug:`5148`
23+
* Bring back test files and the manual to the source distribution tarball.
24+
:bug:`5513`
2325

2426
For packagers:
2527

2628
Other changes:
2729

28-
* Changed `bitesize` label to `good first issue`. Our
29-
[contribute](https://github.com/beetbox/beets/contribute) page is now
30+
* Changed `bitesize` label to `good first issue`. Our `contribute`_ page is now
3031
automatically populated with these issues. :bug:`4855`
3132

33+
.. _contribute: https://github.com/beetbox/beets/contribute
34+
3235
2.1.0 (November 22, 2024)
3336
-------------------------
3437

@@ -37,10 +40,10 @@ New features:
3740
* New template function added: ``%capitalize``. Converts the first letter of
3841
the text to uppercase and the rest to lowercase.
3942
* Ability to query albums with track db fields and vice-versa, for example
40-
`beet list -a title:something` or `beet list artpath:cover`. Consequently
41-
album queries involving `path` field have been sped up, like `beet list -a
42-
path:/path/`.
43-
* :doc:`plugins/ftintitle`: New `keep_in_artist` option for the plugin, which
43+
``beet list -a title:something`` or ``beet list artpath:cover``. Consequently
44+
album queries involving ``path`` field have been sped up, like ``beet list -a
45+
path:/path/``.
46+
* :doc:`plugins/ftintitle`: New ``keep_in_artist`` option for the plugin, which
4447
allows keeping the "feat." part in the artist metadata while still changing
4548
the title.
4649
* :doc:`plugins/autobpm`: Add new configuration option ``beat_track_kwargs``
@@ -68,7 +71,7 @@ Bug fixes:
6871
issues in the future.
6972
:bug:`5289`
7073
* :doc:`plugins/discogs`: Fix the ``TypeError`` when there is no description.
71-
* Remove single quotes from all SQL queries
74+
* Use single quotes in all SQL queries
7275
:bug:`4709`
7376
* :doc:`plugins/lyrics`: Update ``tekstowo`` backend to fetch lyrics directly
7477
since recent updates to their website made it unsearchable.
@@ -82,22 +85,22 @@ Bug fixes:
8285
For packagers:
8386

8487
* The minimum supported Python version is now 3.8.
85-
* The `beet` script has been removed from the repository.
86-
* The `typing_extensions` is required for Python 3.10 and below.
88+
* The ``beet`` script has been removed from the repository.
89+
* The ``typing_extensions`` is required for Python 3.10 and below.
8790

8891
Other changes:
8992

90-
* :doc:`contributing`: The project now uses `poetry` for packaging and
93+
* :doc:`contributing`: The project now uses ``poetry`` for packaging and
9194
dependency management. This change affects project management and mostly
9295
affects beets developers. Please see updates in :ref:`getting-the-source` and
9396
:ref:`testing` for more information.
94-
* :doc:`contributing`: Since `poetry` now manages local virtual environments,
95-
`tox` has been replaced by a task runner `poethepoet`. This change affects
97+
* :doc:`contributing`: Since ``poetry`` now manages local virtual environments,
98+
`tox` has been replaced by a task runner ``poethepoet``. This change affects
9699
beets developers and contributors. Please see updates in the
97100
:ref:`development-tools` section for more details. Type ``poe`` while in
98101
the project directory to see the available commands.
99102
* Installation instructions have been made consistent across plugins
100-
documentation. Users should simply install `beets` with an `extra` of the
103+
documentation. Users should simply install ``beets`` with an ``extra`` of the
101104
corresponding plugin name in order to install extra dependencies for that
102105
plugin.
103106
* GitHub workflows have been reorganised for clarity: style, linting, type and
@@ -108,10 +111,10 @@ Other changes:
108111
documentation is changed, and they only check the changed files. When
109112
dependencies are updated (``poetry.lock``), then the entire code base is
110113
checked.
111-
* The long-deprecated `beets.util.confit` module has been removed. This may
114+
* The long-deprecated ``beets.util.confit`` module has been removed. This may
112115
cause extremely outdated external plugins to fail to load.
113-
* :doc:`plugins/autobpm`: Add plugin dependencies to `pyproject.toml` under
114-
the `autobpm` extra and update the plugin installation instructions in the
116+
* :doc:`plugins/autobpm`: Add plugin dependencies to ``pyproject.toml`` under
117+
the ``autobpm`` extra and update the plugin installation instructions in the
115118
docs.
116119
Since importing the bpm calculation functionality from ``librosa`` takes
117120
around 4 seconds, update the plugin to only do so when it actually needs to

0 commit comments

Comments
 (0)