diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml index e655c9a..8630cd5 100644 --- a/.github/workflows/create-github-release.yml +++ b/.github/workflows/create-github-release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Build and release on GitHub - uses: "marvinpinto/action-automatic-releases@1.2.1" + uses: "marvinpinto/action-automatic-releases@v1.2.1" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - prerelease: true # change this back once tested + prerelease: false diff --git a/.github/workflows/create-pypi-release.yml b/.github/workflows/create-pypi-release.yml index 2aca811..4d11d12 100644 --- a/.github/workflows/create-pypi-release.yml +++ b/.github/workflows/create-pypi-release.yml @@ -9,6 +9,8 @@ jobs: release: runs-on: ubuntu-latest steps: + - name: Check out repository code + uses: actions/checkout@v4 - name: Build and publish to PyPI uses: JRubics/poetry-publish@v1.17 with: diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 45f8b58..6792e42 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -9,12 +9,14 @@ on: jobs: create-pull-request: + permissions: write-all runs-on: ubuntu-latest steps: - name: Check out repository code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: dev + fetch-depth: 0 - name: Install Python uses: actions/setup-python@v4 with: @@ -25,15 +27,13 @@ jobs: poetry-version: 1.7.1 - name: Install base dependencies run: poetry install --sync --only base - - name: Bump version and changelog - run: poetry run invoke release.install release.build -- -v ${{ github.event.inputs.version }} + - name: Bump version + run: | + poetry run -q invoke release.build -- -v ${{ github.event.inputs.version }} - name: Create pull request uses: peter-evans/create-pull-request@v5.0.2 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: "release: v${{ github.event.inputs.version }}" title: "release: v${{ github.event.inputs.version }}" - body: > - This PR is auto-generated by - [create-pull-request](https://github.com/peter-evans/create-pull-request). branch: release/${{ github.event.inputs.version }} diff --git a/.github/workflows/semantic-pull-request.yml b/.github/workflows/semantic-pull-request.yml index d2836b7..8407efa 100644 --- a/.github/workflows/semantic-pull-request.yml +++ b/.github/workflows/semantic-pull-request.yml @@ -26,17 +26,19 @@ jobs: chore feat fix - misc refactor release + revert scopes: | build ci deps docs git + perf pkg - tests + test + style #\d+ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/tag-version-commit.yml b/.github/workflows/tag-version-commit.yml index f746f6f..2b48a5f 100644 --- a/.github/workflows/tag-version-commit.yml +++ b/.github/workflows/tag-version-commit.yml @@ -7,10 +7,11 @@ on: jobs: tag: + permissions: write-all runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - name: Check out repository code + uses: actions/checkout@v4 - name: Generate tag uses: christophebedard/tag-version-commit@v1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 825c32f..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -# Changelog diff --git a/docs/source/conf.py b/docs/source/conf.py index 84e81be..a80654b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -20,7 +20,7 @@ project = "feud" copyright = "2023-2025, Feud Developers" # noqa: A001 author = "Edwin Onuonga (eonu)" -release = "0.1.0a1" +release = "0.1.0a2" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/feud/__init__.py b/feud/__init__.py index 2e1595f..4e76361 100644 --- a/feud/__init__.py +++ b/feud/__init__.py @@ -7,7 +7,7 @@ Not all arguments are bad. """ -__version__ = "0.1.0a1" +__version__ = "0.1.0a2" from feud import click as click from feud import exceptions as exceptions diff --git a/make/release.py b/make/release.py index f46dd0e..7853368 100644 --- a/make/release.py +++ b/make/release.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT # This source code is part of the Feud project (https://feud.wiki). -"""Tasks for bumping the package version and updating CHANGELOG.md.""" +"""Tasks for bumping the package version.""" import os import re @@ -13,12 +13,6 @@ from invoke.tasks import task -@task -def install(c: Config) -> None: - """Install package with core and release dependencies.""" - c.run("poetry install --sync --only base,release") - - @task def build(c: Config, *, v: str) -> None: """Build release.""" @@ -39,7 +33,4 @@ def build(c: Config, *, v: str) -> None: f.write(re.sub(r'__version__ = ".*"', f'__version__ = "{v}"', init)) # bump project version - pyproject.toml - c.run(f"poetry version {v}") - - # auto-generate CHANGELOG.md entry - c.run("poetry run auto-changelog -- --tag-prefix v --github") + c.run(f"poetry version -q {v}") diff --git a/pyproject.toml b/pyproject.toml index 152fded..80d05ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "feud" -version = "0.1.0a1" +version = "0.1.0a2" license = "MIT" authors = ["Edwin Onuonga "] maintainers = ["Edwin Onuonga "] @@ -45,7 +45,6 @@ include = [ "feud", "make", "tests", - "CHANGELOG.md", "LICENSE", "Makefile", "pyproject.toml", @@ -95,9 +94,6 @@ autodoc-pydantic = { version = ">=2.0.0" } pytest = { version = "^7.4.0" } pytest-cov = { version = "^4.1.0" } -[tool.poetry.group.release.dependencies] -auto-changelog = { version = "^0.6.0" } - [tool.ruff] required-version = "0.1.3" select = [