From ed3a53f2fe0d831e24b68c1842f5a6357f4e18eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= Date: Thu, 5 Dec 2024 11:57:19 +0000 Subject: [PATCH 1/2] Exclude plugin tests, include all files from MANIFEST.in --- MANIFEST.in | 36 ------------------------------------ docs/changelog.rst | 6 ++++++ pyproject.toml | 9 ++++++++- 3 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index f5459a443..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,36 +0,0 @@ -# Include tests (but avoid including *.pyc, etc.) -prune test -recursive-include test/rsrc * -recursive-exclude test/rsrc *.pyc -recursive-exclude test/rsrc *.pyo -include test/*.py - -# Include relevant text files. -include LICENSE README.rst -# And generated manpages. -include man/beet.1 -include man/beetsconfig.5 - -# Include the Sphinx documentation. -recursive-include docs *.rst *.py Makefile *.png -prune docs/_build - -# Resources for web plugin. -recursive-include beetsplug/web/templates * -recursive-include beetsplug/web/static * - -# And for the lastgenre plugin. -include beetsplug/lastgenre/genres.txt -include beetsplug/lastgenre/genres-tree.yaml - -# Exclude junk. -global-exclude .DS_Store - -# Include default config -include beets/config_default.yaml - -# Shell completion template -include beets/ui/completion_base.sh - -# Include extra bits -recursive-include extra * diff --git a/docs/changelog.rst b/docs/changelog.rst index 7bedaa457..e3c41b24d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -7,12 +7,18 @@ Unreleased ---------- New features: + Bug fixes: * :doc:`plugins/lyrics`: LRCLib will fallback to plain lyrics if synced lyrics are not found and `synced` flag is set to `yes`. +* Synchronise files included in the source distribution with what we used to + have before the introduction of Poetry. + :bug:`5531` + :bug:`5526` For packagers: + Other changes: 2.2.0 (December 02, 2024) diff --git a/pyproject.toml b/pyproject.toml index cd4b8f881..5b5559d58 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,14 @@ packages = [ { include = "beets" }, { include = "beetsplug" }, ] -include = ["test", "man/**/*"] # extra files to include in the sdist +include = [ # extra files to include in the sdist + "docs", + "extra", + "man/**/*", + "test/*.py", + "test/rsrc/**/*", +] +exclude = ["docs/_build", "docs/modd.conf", "docs/**/*.css"] [tool.poetry.urls] Changelog = "https://github.com/beetbox/beets/blob/master/docs/changelog.rst" From 71eb1bca68284e383e9759586ea576d1f1fd7b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= Date: Fri, 6 Dec 2024 18:24:59 +0000 Subject: [PATCH 2/2] Release: create tag right after commit version update --- .github/workflows/make_release.yaml | 25 +++++++------------------ docs/changelog.rst | 5 +++++ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/make_release.yaml b/.github/workflows/make_release.yaml index 4f54cb46c..cf1b12fe2 100644 --- a/.github/workflows/make_release.yaml +++ b/.github/workflows/make_release.yaml @@ -10,10 +10,11 @@ on: env: PYTHON_VERSION: 3.8 NEW_VERSION: ${{ inputs.version }} + NEW_TAG: v${{ inputs.version }} jobs: increment-version: - name: Bump project version and commit it + name: Bump version, commit and create tag runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -28,13 +29,14 @@ jobs: run: poetry install --only=release - name: Bump project version - id: script run: poe bump "${{ env.NEW_VERSION }}" - uses: EndBug/add-and-commit@v9 - name: Commit the changes + id: commit_and_tag + name: Commit the changes and create tag with: message: "Increment version to ${{ env.NEW_VERSION }}" + tag: "${{ env.NEW_TAG }} --force" build: name: Get changelog and build the distribution package @@ -45,7 +47,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: master + ref: ${{ env.NEW_TAG }} - name: Install Python tools uses: BrandonLWhite/pipx-install-action@v0.1.1 @@ -103,17 +105,6 @@ jobs: env: CHANGELOG: ${{ needs.build.outputs.changelog }} steps: - - uses: actions/checkout@v4 - with: - ref: master - - - name: Tag the commit - id: tag_version - uses: mathieudutour/github-tag-action@v6.2 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - custom_tag: ${{ env.NEW_VERSION }} - - name: Download all the dists uses: actions/download-artifact@v4 with: @@ -123,8 +114,6 @@ jobs: - name: Create a GitHub release id: make_release uses: ncipollo/release-action@v1 - env: - NEW_TAG: ${{ steps.tag_version.outputs.new_tag }} with: tag: ${{ env.NEW_TAG }} name: Release ${{ env.NEW_TAG }} @@ -136,4 +125,4 @@ jobs: with: access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }} url: ${{ secrets.MASTODON_URL }} - message: "Version ${{ steps.tag_version.outputs.new_tag }} of beets has been released! Check out all of the new changes at ${{ steps.create_release.outputs.html_url }}" + message: "Version ${{ env.NEW_TAG }} of beets has been released! Check out all of the new changes at ${{ steps.make_release.outputs.html_url }}" diff --git a/docs/changelog.rst b/docs/changelog.rst index e3c41b24d..bec25ece4 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -21,6 +21,11 @@ For packagers: Other changes: +* Release workflow: fix the issue where the new release tag is created for the + wrong (outdated) commit. Now the tag is created in the same workflow step + right after committing the version update. + :bug:`5539` + 2.2.0 (December 02, 2024) -------------------------