From 7d304b7e3e84d163209dae403a1b2f68ded31555 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Wed, 14 Apr 2021 11:33:31 +0200
Subject: [PATCH] Fix version.txt newline at end in release process
---
bob/devtools/release.py | 2 +-
bob/devtools/scripts/release.py | 9 +++++----
version.txt | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/bob/devtools/release.py b/bob/devtools/release.py
index 1405190d..6c3b6a09 100644
--- a/bob/devtools/release.py
+++ b/bob/devtools/release.py
@@ -544,7 +544,7 @@ def release_package(gitpkg, tag_name, tag_comments_list, dry_run=False):
# commit and push changes
update_files_at_master(
gitpkg,
- {"README.rst": readme_content, "version.txt": version_number},
+ {"README.rst": readme_content, "version.txt": version_number + "\n"},
"Increased latest version to %s [skip ci]" % version_number,
dry_run,
)
diff --git a/bob/devtools/scripts/release.py b/bob/devtools/scripts/release.py
index 57f8725c..95326b7c 100644
--- a/bob/devtools/scripts/release.py
+++ b/bob/devtools/scripts/release.py
@@ -6,10 +6,6 @@ import click
from ..log import get_logger
from ..log import verbosity_option
-from ..release import get_gitlab_instance
-from ..release import parse_and_process_package_changelog
-from ..release import release_package
-from ..release import wait_for_pipeline_to_finish
from . import bdt
logger = get_logger(__name__)
@@ -140,6 +136,11 @@ def release(changelog, group, package, resume, dry_run):
you need to release that package first.
"""
+ from ..release import get_gitlab_instance
+ from ..release import parse_and_process_package_changelog
+ from ..release import release_package
+ from ..release import wait_for_pipeline_to_finish
+
gl = get_gitlab_instance()
# traverse all packages in the changelog, edit older tags with updated
diff --git a/version.txt b/version.txt
index c3ca5647..b28f75af 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.3.1b0
\ No newline at end of file
+3.3.1b0
--
GitLab