From c0e172806fa50178a65c00eb2b9adcbf2b4d1304 Mon Sep 17 00:00:00 2001 From: dmiller Date: Tue, 27 Feb 2024 20:22:43 +0000 Subject: [PATCH] Change Zenmap version syntax to meet pip standards. Fixes #2714 --- zenmap/install_scripts/utils/version_update.py | 1 + zenmap/share/zenmap/config/zenmap_version | 2 +- zenmap/zenmapCore/Name.py | 2 +- zenmap/zenmapCore/Version.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zenmap/install_scripts/utils/version_update.py b/zenmap/install_scripts/utils/version_update.py index 8ff9d84d5..ea2efd07b 100644 --- a/zenmap/install_scripts/utils/version_update.py +++ b/zenmap/install_scripts/utils/version_update.py @@ -86,6 +86,7 @@ def update_date(base_dir): def update_version(base_dir, version): + version = re.sub(r'(?=[^0-9.])', '+', version, 1) print(">>> Updating %s" % os.path.join(base_dir, VERSION)) vf = open(os.path.join(base_dir, VERSION), "w") print(version, file=vf) diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version index f23c7d384..6c84dfce1 100644 --- a/zenmap/share/zenmap/config/zenmap_version +++ b/zenmap/share/zenmap/config/zenmap_version @@ -1 +1 @@ -7.94SVN +7.94+SVN diff --git a/zenmap/zenmapCore/Name.py b/zenmap/zenmapCore/Name.py index 166e7fe41..816250884 100644 --- a/zenmap/zenmapCore/Name.py +++ b/zenmap/zenmapCore/Name.py @@ -64,7 +64,7 @@ APP_DISPLAY_NAME = "Zenmap" APP_WEB_SITE = "https://nmap.org/zenmap/" APP_DOWNLOAD_SITE = "https://nmap.org/download.html" APP_DOCUMENTATION_SITE = "https://nmap.org/book/zenmap.html" -APP_COPYRIGHT = "Copyright 2005-2023 Nmap Software LLC" +APP_COPYRIGHT = "Copyright 2005-2024 Nmap Software LLC" NMAP_DISPLAY_NAME = "Nmap" NMAP_WEB_SITE = "https://nmap.org" diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py index b3fede4a7..89ccbfe34 100644 --- a/zenmap/zenmapCore/Version.py +++ b/zenmap/zenmapCore/Version.py @@ -1 +1 @@ -VERSION = "7.94SVN" +VERSION = "7.94+SVN"