From 02c40b28fb70e96bb7382def14686a1817bd843e Mon Sep 17 00:00:00 2001 From: Nathan Collins Date: Tue, 10 Sep 2024 19:32:15 +0800 Subject: [PATCH] Use pre instead of ~pre suffix for pre-release versions Because Setup Tools doesn't support the ~pre suffix anymore: - https://stackoverflow.com/a/75671981/470844 - https://github.com/pypa/setuptools/issues/3772#issuecomment-1384342813 --- README.md | 6 +++--- debian/changelog | 2 +- setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index da56c0c..90384f7 100644 --- a/README.md +++ b/README.md @@ -179,13 +179,13 @@ to test your local copy of `fluxgui` without installing anything. Note changes in `./debian/changelog`. -Use version `~pre` until ready to release a version. When -releasing a version remove the `~pre` suffix from the version strings +Use version `pre` until ready to release a version. When +releasing a version remove the `pre` suffix from the version strings and commit, copying the changelog changes for the current release into the commit message. Then `git tag -a v`, using the commit msg for the tag annotation, and push the version tag with `git push origin v`. Finally, create another commit with the new `~pre` version strings and changelog entry. +version>pre` version strings and changelog entry. When releasing the version string needs to be changed in `debian/changelog` and `setup.py`, and the release dates needs to be diff --git a/debian/changelog b/debian/changelog index b3fcabe..4b4995e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ # -*- text -*- -fluxgui (2.0.1~pre) wily; urgency=low +fluxgui (2.0.1pre) wily; urgency=low * fix buggy appindicator import https://github.com/xflux-gui/fluxgui/commit/a21f55fc61f596cfc74e22bef3aaa3ad761f8393 diff --git a/setup.py b/setup.py index 6ba6c62..9313194 100755 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ def run(self): self.spawn(["glib-compile-schemas", gschema_dir]) setup(name = "f.lux indicator applet", - version = "2.0.1~pre", + version = "2.0.1pre", description = "f.lux indicator applet - better lighting for your computer", author = "Kilian Valkhof, Michael and Lorna Herf, Josh Winters", author_email = "kilian@kilianvalkhof.com",