Skip to content

Commit

Permalink
update release tooling
Browse files Browse the repository at this point in the history
  • Loading branch information
GjjvdBurg committed Sep 13, 2024
1 parent b0f04f1 commit 9e241f8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
path: dist/

- name: Sign the dists with Sigstore
uses: sigstore/gh-action-sigstore-python@v1.2.3
uses: sigstore/gh-action-sigstore-python@v3.0.0
with:
inputs: >-
./dist/*.tar.gz
Expand Down
14 changes: 5 additions & 9 deletions make_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ def build_release_message(context, commit: bool = False) -> str:
f"{context['next_version']}"
)
message += "\n"
message += "\n"
message += context["changelog_update"]
return message

Expand Down Expand Up @@ -202,9 +203,9 @@ def action(self, context):
self.instruct(
f"Update change log for version {context['next_version']}"
)
self.system("vi CHANGELOG.md")
self.system("vim CHANGELOG.md")
self.instruct("TEMP: Copy the latest section to the update file")
self.system("vi CHANGELOG.md /tmp/changelog_update.md")
self.system("vim CHANGELOG.md /tmp/changelog_update.md")
with open("/tmp/changelog_update.md", "r") as fileobj:
context["changelog_update"] = fileobj.read()

Expand Down Expand Up @@ -241,11 +242,6 @@ def action(self, context):
self.execute("make docs")


class MakeMan(Step):
def action(self, context):
self.execute("make man")


class MakeDist(Step):
def action(self, context):
self.execute("make dist")
Expand All @@ -270,7 +266,7 @@ def action(self, context):
f"Ensuring that the package has version {context['next_version']}"
)
version = self.execute(
f"source {context['tmpvenv']}/bin/activate && veld -V",
f"source {context['tmpvenv']}/bin/activate && p2r -V",
silent=True,
confirm=False,
)
Expand Down Expand Up @@ -379,7 +375,7 @@ def main(target=None):
("ci1", WaitForCI()),
("bumpversion", BumpVersionPackage()),
("clean2", MakeClean()),
("man1", MakeMan()),
("docs", MakeDocs()),
("gitadd2", GitAddVersionAndMan()),
("gittagpre", GitTagPreRelease()),
# triggers Github Actions to build dists and push to TestPyPI
Expand Down

0 comments on commit 9e241f8

Please sign in to comment.