From 64f60ce9697bb4fdb6c48c8a0fc82ae1977b8ea1 Mon Sep 17 00:00:00 2001 From: Quinten Stokkink Date: Tue, 13 Feb 2024 17:32:11 +0100 Subject: [PATCH] Automated version increment --- doc/conf.py | 6 +++--- github_increment_version.py | 10 +++++----- ipv8/REST/rest_manager.py | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 3beb3a48d..decb15906 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -21,13 +21,13 @@ # -- Project information ----------------------------------------------------- project = 'IPv8' -copyright = '2017-2023, Tribler' # Do not change manually! Handled by github_increment_version.py +copyright = '2017-2024, Tribler' # Do not change manually! Handled by github_increment_version.py author = 'Tribler' # The short X.Y version -version = '2.12' # Do not change manually! Handled by github_increment_version.py +version = '2.13' # Do not change manually! Handled by github_increment_version.py # The full version, including alpha/beta/rc tags -release = '2.12.0' # Do not change manually! Handled by github_increment_version.py +release = '2.13.0' # Do not change manually! Handled by github_increment_version.py # -- General configuration --------------------------------------------------- diff --git a/github_increment_version.py b/github_increment_version.py index 47382bc53..22e27163d 100644 --- a/github_increment_version.py +++ b/github_increment_version.py @@ -131,7 +131,7 @@ def modify_setup(file_contents: str, setup_expression: ast.Expr) -> tuple[str, s old_version = cast(ast.Name, keyword.value).s version = Version(old_version) - new_vstring = str(version) + new_vstring = [version.major, version.minor, version.micro] old_version_tag = '.'.join(str(s) for s in new_vstring[:2]) new_vstring[1] += 1 new_version = '.'.join(str(s) for s in new_vstring) @@ -327,16 +327,16 @@ def commit_messages_to_names(commit_msg_list: list[str]) -> list[str]: return sorted(out) -pr = ipv8_repo.create_pull("Automated Version Update", - "Suggested release message\n---\n" +pr = ipv8_repo.create_pull(title="Automated Version Update", + body="Suggested release message\n---\n" f"Tag version: {new_version_tag}\n" f"Release title: IPv8 v{new_version_tag}.{total_commits} release\nBody:\n" f"Includes the first {total_commits} commits (+{commits_since_last} since v{old_version_tag}) for IPv8, containing:\n\n - " + ("\n - ".join(commit_messages_to_names([c.commit.message.split('\n')[2] for c in comparison.commits if c.commit.message.startswith('Merge')]))), - 'master', - '{}:{}'.format(username, 'automated_version_update'), True) + base='master', + head='{}:{}'.format(username, 'automated_version_update'), draft=True) pr_labels = next(label for label in ipv8_repo.get_labels() if label.name == "automatedpr") pr.add_to_labels(pr_labels) diff --git a/ipv8/REST/rest_manager.py b/ipv8/REST/rest_manager.py index 154ebafff..fecae9a9d 100644 --- a/ipv8/REST/rest_manager.py +++ b/ipv8/REST/rest_manager.py @@ -115,7 +115,7 @@ async def start(self, port: int = 8085, host: str = '127.0.0.1', api_key: str | aiohttp_apispec = AiohttpApiSpec( app=self.root_endpoint.app, title="IPv8 REST API documentation", - version="v2.12", # Do not change manually! Handled by github_increment_version.py + version="v2.13", # Do not change manually! Handled by github_increment_version.py url="/docs/swagger.json", swagger_path="/docs", ) diff --git a/setup.py b/setup.py index 682502819..8830c8fd4 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ description='The Python implementation of the IPV8 library', long_description=long_description, long_description_content_type='text/markdown', - version='2.12.0', # Do not change manually! Handled by github_increment_version.py + version='2.13.0', # Do not change manually! Handled by github_increment_version.py url='https://github.com/Tribler/py-ipv8', package_data={'': ['*.*']}, packages=find_packages(),