From e5f29df5c471ca24e60b3672fb77873767161d5a Mon Sep 17 00:00:00 2001 From: Joe Schr Date: Fri, 11 Mar 2022 17:53:29 +0100 Subject: [PATCH 1/3] __init__: "develop" check also works with appended to the front version number --- freqtrade/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/freqtrade/__init__.py b/freqtrade/__init__.py index 2747efc96..f1c070800 100644 --- a/freqtrade/__init__.py +++ b/freqtrade/__init__.py @@ -1,12 +1,11 @@ """ Freqtrade bot """ __version__ = 'develop' -if __version__ == 'develop': - +if __version__.endswith('develop'): try: import subprocess - __version__ = 'develop-' + subprocess.check_output( + __version__ = __version__ + '-' + subprocess.check_output( ['git', 'log', '--format="%h"', '-n 1'], stderr=subprocess.DEVNULL).decode("utf-8").rstrip().strip('"') From ef8f6783c7f0a15fff9cfb0beed93c72f43d4673 Mon Sep 17 00:00:00 2001 From: Joe Schr Date: Fri, 11 Mar 2022 18:20:57 +0100 Subject: [PATCH 2/3] __init__: latest release version before develop version --- freqtrade/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/freqtrade/__init__.py b/freqtrade/__init__.py index f1c070800..1cb458b7f 100644 --- a/freqtrade/__init__.py +++ b/freqtrade/__init__.py @@ -1,5 +1,5 @@ """ Freqtrade bot """ -__version__ = 'develop' +__version__ = '2022.2.1-develop' if __version__.endswith('develop'): try: @@ -29,5 +29,4 @@ if __version__.endswith('develop'): versionfile = Path('./freqtrade_commit') if versionfile.is_file(): __version__ = f"docker-{versionfile.read_text()[:8]}" - except Exception: - pass + except Exception: pass From 70bcc7082681cbad37b3ac6a008c65016e848644 Mon Sep 17 00:00:00 2001 From: Joe Schr Date: Fri, 11 Mar 2022 18:22:55 +0100 Subject: [PATCH 3/3] __init__: use canonical "dev" instead of "develop" see https://peps.python.org/pep-0440/#implicit-development-release-number --- freqtrade/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freqtrade/__init__.py b/freqtrade/__init__.py index 1cb458b7f..0a30458a7 100644 --- a/freqtrade/__init__.py +++ b/freqtrade/__init__.py @@ -1,7 +1,7 @@ """ Freqtrade bot """ -__version__ = '2022.2.1-develop' +__version__ = '2022.2.1-dev' -if __version__.endswith('develop'): +if __version__.endswith('dev'): try: import subprocess