diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index 6015d27..0000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[bumpversion] -current_version = 2.1.11 -commit = True -tag = False -serialize = {major}.{minor}.{patch} - -[bumpversion:file:pyproject.toml] -search = version = "{current_version}" -replace = version = "{new_version}" - -[bumpversion:file:manga-dlp.py] -search = MDLP_VERSION = "{current_version}" -replace = MDLP_VERSION = "{new_version}" - -[bumpversion:file:mangadlp/input.py] -search = MDLP_VERSION = "{current_version}" -replace = MDLP_VERSION = "{new_version}" - -[bumpversion:file:.woodpecker/test_docker.yml] -search = BUILD_VERSION={current_version} -replace = BUILD_VERSION={new_version} - -[bumpversion:file:.woodpecker/test_release.yml] -search = {current_version} -replace = {new_version} diff --git a/.woodpecker/test_docker_amd64.yml b/.woodpecker/test_docker_amd64.yml index 4eff313..2c9b362 100644 --- a/.woodpecker/test_docker_amd64.yml +++ b/.woodpecker/test_docker_amd64.yml @@ -32,4 +32,4 @@ pipeline: dockerfile: docker/Dockerfile.amd64 auto_tag: true auto_tag_suffix: linux-amd64-test - build_args: BUILD_VERSION=2.1.11 + build_args: BUILD_VERSION=test diff --git a/.woodpecker/test_docker_arm64.yml b/.woodpecker/test_docker_arm64.yml index 4b20923..44f12bf 100644 --- a/.woodpecker/test_docker_arm64.yml +++ b/.woodpecker/test_docker_arm64.yml @@ -32,4 +32,4 @@ pipeline: dockerfile: docker/Dockerfile.arm64 auto_tag: true auto_tag_suffix: linux-arm64-test - build_args: BUILD_VERSION=2.1.11 + build_args: BUILD_VERSION=test diff --git a/.woodpecker/test_release.yml b/.woodpecker/test_release.yml index 2c9b429..038d908 100644 --- a/.woodpecker/test_release.yml +++ b/.woodpecker/test_release.yml @@ -36,5 +36,5 @@ pipeline: image: cr.44net.ch/baseimages/debian-base pull: true commands: - - bash get_release_notes.sh 2.1.11 + - bash get_release_notes.sh latest - cat RELEASENOTES.md diff --git a/get_release_notes.sh b/get_release_notes.sh index 2f0b189..b75d415 100755 --- a/get_release_notes.sh +++ b/get_release_notes.sh @@ -29,6 +29,9 @@ function get_release_notes() { printf 'You need to specify a version with $1\n' exit 1 fi + if [[ ${l_version,,} == "latest" ]]; then + l_version="$(grep -o -E "^##\s\[[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2}\]" CHANGELOG.md | head -n 1 | grep -o -E "[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2}")" + fi awk -v ver="[${l_version}]" \ '/^## / { if (p) { exit }; if ($2 == ver) { p=1 } } p && NF' \ 'CHANGELOG.md' > 'RELEASENOTES.md' diff --git a/manga-dlp.py b/manga-dlp.py index 5178cd3..b880acf 100644 --- a/manga-dlp.py +++ b/manga-dlp.py @@ -1,6 +1,4 @@ from mangadlp.input import main -MDLP_VERSION = "2.1.11" - if __name__ == "__main__": main() diff --git a/mangadlp/__about__.py b/mangadlp/__about__.py new file mode 100644 index 0000000..dd0edd7 --- /dev/null +++ b/mangadlp/__about__.py @@ -0,0 +1 @@ +__version__ = "2.1.11" diff --git a/mangadlp/input.py b/mangadlp/input.py index e242e2f..aef95b8 100644 --- a/mangadlp/input.py +++ b/mangadlp/input.py @@ -3,20 +3,19 @@ import sys from pathlib import Path from mangadlp import app, logger +from mangadlp.__about__ import __version__ from mangadlp.logger import Logger # prepare logger log = Logger(__name__) -MDLP_VERSION = "2.1.11" - def check_args(args): # set logger formatting logger.format_logger(args.verbosity) # check if --version was used if args.version: - print(f"manga-dlp version: {MDLP_VERSION}") + print(f"manga-dlp version: {__version__}") sys.exit(0) # check if a readin list was provided if not args.read: @@ -63,7 +62,7 @@ def call_app(args): def get_input(): - print(f"manga-dlp version: {MDLP_VERSION}") + print(f"manga-dlp version: {__version__}") print("Enter details of the manga you want to download:") while True: try: diff --git a/pyproject.toml b/pyproject.toml index 0a7fa8a..9afe30f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["hatchling>=1.4.1"] build-backend = "hatchling.build" [project] -version = "2.1.11" +dynamic = ["version"] name = "manga-dlp" description = "A cli manga downloader" readme = "README.md" @@ -39,6 +39,9 @@ Source = "https://github.com/olofvndrhr/manga-dlp" mangadlp = "mangadlp.input:main" manga-dlp = "mangadlp.input:main" +[tool.hatch.version] +path = "mangadlp/__about__.py" + [tool.hatch.build] ignore-vcs = true