From bff18027f820b643bcad2d0a2ef833fc97929296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kr=C3=B6ger?= Date: Fri, 31 Jul 2026 15:19:33 +0200 Subject: [PATCH] Fix version still displayed based on adminapi Serveradmin and Adminapi both now have independent versions. When seperating the packages this was missed to be adjusted. --- packages/adminapi/adminapi/__init__.py | 3 +-- packages/adminapi/adminapi/request.py | 2 +- packages/serveradmin/serveradmin/__init__.py | 4 +++- .../serveradmin/serveradmin/common/templatetags/common.py | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/adminapi/adminapi/__init__.py b/packages/adminapi/adminapi/__init__.py index fc77fd13d..792e19405 100644 --- a/packages/adminapi/adminapi/__init__.py +++ b/packages/adminapi/adminapi/__init__.py @@ -5,5 +5,4 @@ __version__ = "4.26.0" -# Kept for backward compatibility (e.g. serveradmin templatetags). -VERSION = tuple(int(part) for part in __version__.split(".")) +VERSION = __version__ \ No newline at end of file diff --git a/packages/adminapi/adminapi/request.py b/packages/adminapi/adminapi/request.py index c48436afc..42fbe9b52 100644 --- a/packages/adminapi/adminapi/request.py +++ b/packages/adminapi/adminapi/request.py @@ -160,7 +160,7 @@ def _build_request(endpoint, get_params, post_params, retry=1): 'Content-Encoding': 'application/x-json', 'Accept-Encoding': 'gzip', 'X-Timestamp': str(timestamp), - 'X-API-Version': '.'.join(str(v) for v in VERSION), + 'X-API-Version': VERSION, } if Settings.auth_key: diff --git a/packages/serveradmin/serveradmin/__init__.py b/packages/serveradmin/serveradmin/__init__.py index 229b6e447..b5a67e639 100644 --- a/packages/serveradmin/serveradmin/__init__.py +++ b/packages/serveradmin/serveradmin/__init__.py @@ -3,4 +3,6 @@ Copyright (c) 2020 InnoGames GmbH """ -__version__ = "4.25.0" +__version__ = "4.26.1" + +VERSION = __version__ diff --git a/packages/serveradmin/serveradmin/common/templatetags/common.py b/packages/serveradmin/serveradmin/common/templatetags/common.py index ead91e01b..72d6ac2b5 100644 --- a/packages/serveradmin/serveradmin/common/templatetags/common.py +++ b/packages/serveradmin/serveradmin/common/templatetags/common.py @@ -5,7 +5,7 @@ from django import template -from adminapi import VERSION +from serveradmin import VERSION register = template.Library() @@ -63,4 +63,4 @@ def group(items, number_of_groups): @register.simple_tag() def get_version(): """Get current Serveradmin version""" - return 'v' + '.'.join([str(v) for v in VERSION]) + return 'v' + VERSION