From e72b7ca25cb8a175be47002bea482531ac539347 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 30 Sep 2024 16:08:18 +0000 Subject: [PATCH] version.py: rm APK_VERSION related: https://github.com/spesmilo/electrum/issues/9210#issuecomment-2376572832 --- contrib/add_cosigner | 9 ++++----- contrib/android/buildozer_qml.spec | 2 +- contrib/make_download | 9 ++++----- contrib/print_electrum_version.py | 2 -- contrib/release.sh | 12 +++++------- electrum/version.py | 1 - 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/contrib/add_cosigner b/contrib/add_cosigner index 3205ef743a6f..e78210001624 100755 --- a/contrib/add_cosigner +++ b/contrib/add_cosigner @@ -37,13 +37,12 @@ version_module = importlib.util.module_from_spec(version_spec) version_spec.loader.exec_module(version_module) ELECTRUM_VERSION = version_module.ELECTRUM_VERSION -APK_VERSION = version_module.APK_VERSION print("version", ELECTRUM_VERSION) # GPG name of cosigner cosigner = sys.argv[1] -version = version_win = version_mac = ELECTRUM_VERSION +version = version_win = version_mac = version_android = ELECTRUM_VERSION files = { "tgz": f"Electrum-{version}.tar.gz", @@ -53,9 +52,9 @@ files = { "win": f"electrum-{version_win}.exe", "win_setup": f"electrum-{version_win}-setup.exe", "win_portable": f"electrum-{version_win}-portable.exe", - "apk_arm64": f"Electrum-{APK_VERSION}-arm64-v8a-release.apk", - "apk_armeabi": f"Electrum-{APK_VERSION}-armeabi-v7a-release.apk", - "apk_x86_64": f"Electrum-{APK_VERSION}-x86_64-release.apk", + "apk_arm64": f"Electrum-{version_android}-arm64-v8a-release.apk", + "apk_armeabi": f"Electrum-{version_android}-armeabi-v7a-release.apk", + "apk_x86_64": f"Electrum-{version_android}-x86_64-release.apk", } diff --git a/contrib/android/buildozer_qml.spec b/contrib/android/buildozer_qml.spec index da00ecd9cbcf..9a5cd72815bf 100644 --- a/contrib/android/buildozer_qml.spec +++ b/contrib/android/buildozer_qml.spec @@ -40,7 +40,7 @@ source.exclude_patterns = Makefile,setup*, packages/frozenlist-*.dist-info/* # (str) Application versioning (method 1) -version.regex = APK_VERSION = '(.*)' +version.regex = ELECTRUM_VERSION = '(.*)' version.filename = %(source.dir)s/electrum/version.py # (str) Application versioning (method 2) diff --git a/contrib/make_download b/contrib/make_download index b2fd315c3194..96a8f32637f7 100755 --- a/contrib/make_download +++ b/contrib/make_download @@ -19,7 +19,6 @@ version_module = importlib.util.module_from_spec(version_spec) version_spec.loader.exec_module(version_module) ELECTRUM_VERSION = version_module.ELECTRUM_VERSION -APK_VERSION = version_module.APK_VERSION print(f"version: {ELECTRUM_VERSION}", file=sys.stderr) dirname = sys.argv[1] @@ -37,7 +36,7 @@ download_page_str = download_page_str.replace("##VERSION##", version) download_page_str = download_page_str.replace("##VERSION_WIN##", version_win) download_page_str = download_page_str.replace("##VERSION_MAC##", version_mac) download_page_str = download_page_str.replace("##VERSION_ANDROID##", version_android) -download_page_str = download_page_str.replace("##VERSION_APK##", APK_VERSION) +download_page_str = download_page_str.replace("##VERSION_APK##", version_android) # note: all dist files need to be listed here that we expect sigs for, # even if they are not linked to from the website @@ -49,9 +48,9 @@ files = { "win": f"electrum-{version_win}.exe", "win_setup": f"electrum-{version_win}-setup.exe", "win_portable": f"electrum-{version_win}-portable.exe", - "apk_arm64": f"Electrum-{APK_VERSION}-arm64-v8a-release.apk", - "apk_armeabi": f"Electrum-{APK_VERSION}-armeabi-v7a-release.apk", - "apk_x86_64": f"Electrum-{APK_VERSION}-x86_64-release.apk", + "apk_arm64": f"Electrum-{version_android}-arm64-v8a-release.apk", + "apk_armeabi": f"Electrum-{version_android}-armeabi-v7a-release.apk", + "apk_x86_64": f"Electrum-{version_android}-x86_64-release.apk", } # default signers diff --git a/contrib/print_electrum_version.py b/contrib/print_electrum_version.py index 1e10bfd026de..0cce03af8d3f 100755 --- a/contrib/print_electrum_version.py +++ b/contrib/print_electrum_version.py @@ -4,10 +4,8 @@ # # For example: # $ VERSION=$("$CONTRIB"/print_electrum_version.py) -# $ VERSION=$("$CONTRIB"/print_electrum_version.py APK_VERSION) # instead of # $ VERSION=$(python3 -c "import electrum; print(electrum.version.ELECTRUM_VERSION)") -# $ VERSION=$(python3 -c "import electrum; print(electrum.version.APK_VERSION)") import importlib.util import os diff --git a/contrib/release.sh b/contrib/release.sh index c3c92cf3bca3..661f025c8d84 100755 --- a/contrib/release.sh +++ b/contrib/release.sh @@ -82,9 +82,7 @@ fi VERSION=$("$CONTRIB"/print_electrum_version.py) -APK_VERSION=$("$CONTRIB"/print_electrum_version.py APK_VERSION) info "VERSION: $VERSION" -info "APK_VERSION: $APK_VERSION" REV=$(git describe --tags) info "REV: $REV" COMMIT=$(git rev-parse HEAD) @@ -149,13 +147,13 @@ else fi # android -apk1="Electrum-$APK_VERSION-armeabi-v7a-release.apk" -apk2="Electrum-$APK_VERSION-arm64-v8a-release.apk" -apk3="Electrum-$APK_VERSION-x86_64-release.apk" +apk1="Electrum-$VERSION-armeabi-v7a-release.apk" +apk2="Electrum-$VERSION-arm64-v8a-release.apk" +apk3="Electrum-$VERSION-x86_64-release.apk" for arch in armeabi-v7a arm64-v8a x86_64 do - apk="Electrum-$APK_VERSION-$arch-release.apk" - apk_unsigned="Electrum-$APK_VERSION-$arch-release-unsigned.apk" + apk="Electrum-$VERSION-$arch-release.apk" + apk_unsigned="Electrum-$VERSION-$arch-release-unsigned.apk" if test -f "dist/$apk"; then info "file exists: $apk" else diff --git a/electrum/version.py b/electrum/version.py index 4ba739142c7f..c9567248dca6 100644 --- a/electrum/version.py +++ b/electrum/version.py @@ -1,5 +1,4 @@ ELECTRUM_VERSION = '4.5.5' # version of the client package -APK_VERSION = '4.5.5.0' # read by buildozer.spec PROTOCOL_VERSION = '1.4' # protocol version requested