fdroidserver 2.4.1__tar.gz → 2.4.3__tar.gz

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/.gitlab-ci.yml

@@ -512,6 +512,9 @@ fdroid build:
         - fdroidserver/net.py
         - fdroidserver/scanner.py
         - fdroidserver/vmtools.py
+        # for the docker: job which depends on this one
+        - makebuildserver
+        - buildserver/*
   cache:
     key: "$CI_JOB_NAME"
     paths:

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [2.4.3] - 2025-12-04
+
+### Fixed
+
+* Support Python 3.14 and fix tests on macOS
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1751
+
+## [2.4.2] - 2025-06-24
+
+### Fixed
+
+* nightly: fix bug that clones nightly repo to wrong location
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1672
+* Sync translations for all supported languages: es pl ru
+
 ## [2.4.1] - 2025-06-23
 
 ### Added

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.4.1
+Version: 2.4.3
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/fdroidserver/common.py

@@ -4658,8 +4658,8 @@ def calculate_math_string(expr):
     }
 
     def execute_ast(node):
-        if isinstance(node, ast.Num):  # <number>
-            return node.n
+        if isinstance(node, ast.Constant):  # <number>
+            return node.value
         elif isinstance(node, ast.BinOp):  # <left> <operator> <right>
             return ops[type(node.op)](execute_ast(node.left),
                                       execute_ast(node.right))

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/fdroidserver/nightly.py

@@ -396,9 +396,11 @@ def main():
         git_mirror_repodir = os.path.join(git_mirror_fdroiddir, 'repo')
         git_mirror_metadatadir = os.path.join(git_mirror_fdroiddir, 'metadata')
         if not os.path.isdir(git_mirror_repodir):
-            clone_git_repo(clone_url, git_mirror_repodir)
+            clone_git_repo(clone_url, git_mirror_path)
         if not os.path.isdir(git_mirror_repodir):
             os.makedirs(git_mirror_repodir, mode=0o755)
+        if os.path.exists('LICENSE'):
+            shutil.copy2('LICENSE', git_mirror_path)
 
         mirror_git_repo = git.Repo.init(git_mirror_path)
         writer = mirror_git_repo.config_writer()

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/fdroidserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.4.1
+Version: 2.4.3
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/gradlew-fdroid

@@ -188,6 +188,7 @@ get_sha() {
         '7.6.2')  echo 'a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac' ;;
         '7.6.3')  echo '740c2e472ee4326c33bf75a5c9f5cd1e69ecf3f9b580f6e236c86d1f3d98cfac' ;;
         '7.6.4')  echo 'bed1da33cca0f557ab13691c77f38bb67388119e4794d113e051039b80af9bb1' ;;
+        '7.6.5')  echo 'b812fec0edb7d27e0ae35955887bb2954536fa3e44edaf481150da058e154d9a' ;;
         '8.0')    echo '4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788' ;;
         '8.0.1')  echo '1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909' ;;
         '8.0.2')  echo 'ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7' ;;
@@ -211,8 +212,8 @@ get_sha() {
         '8.12.1') echo '8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94' ;;
         '8.13')   echo '20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78' ;;
         '8.14')   echo '61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa' ;;
-        '8.14.1')   echo '845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf' ;;
-        '8.14.2')   echo '7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999' ;;
+        '8.14.1') echo '845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf' ;;
+        '8.14.2') echo '7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999' ;;
         *) exit 1
     esac
 }
@@ -233,7 +234,7 @@ d_gradle_plugin_ver_k=(8.9    8.8    8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.4 7.3 7.2
 d_plugin_min_gradle_v=(8.11.1 8.10.2 8.9 8.7 8.7 8.6 8.4 8.2 8.0 8.0 7.5 7.4 7.3.3 7.2 7.0.2 6.7.1 6.5 6.1.1 5.6.4 5.4.1 5.1.1 4.10.1 4.6 4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12)
 
 # All gradle versions we know about
-plugin_v=(8.14.2 8.14.1 8.14 8.13 8.12.1 8.12 8.11.1 8.11 8.10.2 8.10.1 8.10 8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2.1 8.2 8.1.1 8.1 8.0.2 8.0.1 8.0 7.6.4 7.6.3 7.6.2 7.6.1 7.6 7.5.1 7.5 7.4.2 7.4.1 7.4 7.3.3 7.3.2 7.3.1 7.3 7.2 7.1.1 7.1 7.0.2 7.0.1 7.0 6.9.4 6.9.3 6.9.2 6.9.1 6.9 6.8.3 6.8.2 6.8.1 6.8 6.7.1 6.7 6.6.1 6.6 6.5.1 6.5 6.4.1 6.4 6.3 6.2.2 6.2.1 6.2 6.1.1 6.1 6.0.1 6.0 5.6.4 5.6.3 5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 2.0 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4 1.3 1.2 1.1 1.0 0.9.2 0.9.1 0.9 0.8 0.7)
+plugin_v=(8.14.2 8.14.1 8.14 8.13 8.12.1 8.12 8.11.1 8.11 8.10.2 8.10.1 8.10 8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2.1 8.2 8.1.1 8.1 8.0.2 8.0.1 8.0 7.6.5 7.6.4 7.6.3 7.6.2 7.6.1 7.6 7.5.1 7.5 7.4.2 7.4.1 7.4 7.3.3 7.3.2 7.3.1 7.3 7.2 7.1.1 7.1 7.0.2 7.0.1 7.0 6.9.4 6.9.3 6.9.2 6.9.1 6.9 6.8.3 6.8.2 6.8.1 6.8 6.7.1 6.7 6.6.1 6.6 6.5.1 6.5 6.4.1 6.4 6.3 6.2.2 6.2.1 6.2 6.1.1 6.1 6.0.1 6.0 5.6.4 5.6.3 5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 2.0 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4 1.3 1.2 1.1 1.0 0.9.2 0.9.1 0.9 0.8 0.7)
 
 v_all=${plugin_v[@]}
 

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/locale/es/LC_MESSAGES/fdroidserver.po

@@ -14,20 +14,21 @@
 # Jaime Marquínez Ferrándiz <weblate@jregistros.fastmail.net>, 2022.
 # gallegonovato <fran-carro@hotmail.es>, 2022, 2023, 2024.
 # Nicolás Pérez <ccnicolasperez@gmail.com>, 2025.
+# Swyter <swyterzone@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2025-03-25 11:36+0100\n"
-"PO-Revision-Date: 2025-03-16 22:47+0000\n"
-"Last-Translator: Nicolás Pérez <ccnicolasperez@gmail.com>\n"
+"PO-Revision-Date: 2025-06-24 11:02+0000\n"
+"Last-Translator: Swyter <swyterzone@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/f-droid/fdroidserver/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -492,9 +493,9 @@ msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Creando \"{path}\" para configurar s3cmd."
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Creating empty {config_file}"
-msgstr "Leyendo '{config_file}'"
+msgstr "Creando el archivo vacío {config_file}"
 
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
@@ -1811,7 +1812,7 @@ msgstr "Entrada desconocida {key} en {configname}"
 
 #: ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
-msgstr "¡Se encontró una excepción desconocida!"
+msgstr "Se ha producido una excepción desconocida"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -1993,7 +1994,7 @@ msgstr "Usando s3cmd para sincronizar con: {url}"
 
 #: ../fdroidserver/__main__.py
 msgid "Valid commands are:"
-msgstr "Los comandos válidos son:"
+msgstr "Las órdenes válidas son:"
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/locale/pl/LC_MESSAGES/fdroidserver.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2025-03-25 11:36+0100\n"
-"PO-Revision-Date: 2025-06-14 18:05+0000\n"
+"PO-Revision-Date: 2025-06-24 12:05+0000\n"
 "Last-Translator: WaldiS <sto@tutanota.de>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/f-droid/fdroidserver/pl/>\n"
 "Language: pl\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.12-dev\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -45,7 +45,7 @@ msgstr "\"%s/\" nie ma pasującego pliku metadanych!"
 
 #: ../fdroidserver/index.py
 msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
+msgstr "Klucz „isPrimary” nie powinien być dodawany do mirrorów!"
 
 #: ../fdroidserver/index.py
 #, python-brace-format
@@ -657,12 +657,12 @@ msgstr "BŁĄD: {key} w {path} nie jest \"archive\" lub \"repo\"!"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "ERROR: {key} not a valid key!"
-msgstr ""
+msgstr "BŁĄD: {key} nie jest prawidłowym kluczem!"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
+msgstr "BŁĄD: wartość klucza {key} powinna być typu {t}!"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -689,9 +689,9 @@ msgid "Environment variable {var} from {configname} is not set!"
 msgstr "Zmienna środowiskowa {var} z {configname} nie jest ustawiona!"
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Zmienna środowiskowa {var} z {configname} nie jest ustawiona!"
+msgstr "Zmienna środowiskowa{{env: {var}}} nie została ustawiona!"
 
 #: ../fdroidserver/deploy.py
 msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
@@ -933,9 +933,9 @@ msgid "Ignoring bad element in manifest: %s"
 msgstr "Ignorowanie błędnego elementu w manifeście: %s"
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} jest przestarzałe, użyj {newfile}"
+msgstr "{oldfile} jest przestarzałe, użyj {newfile}!"
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -1143,7 +1143,7 @@ msgstr "Osiągnięto maksymalną głębokość rekurencji w pliku ZIP: %s"
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
+msgstr "Konfiguracja Mirror dla {url} zawiera klucz \"isPrimary\"!"
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
@@ -1310,7 +1310,7 @@ msgstr "Tylko PNG i JPEG są obsługiwane dla grafiki, znaleziono: {path}"
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Only accepts a single key \"env\""
-msgstr ""
+msgstr "Akceptowany jest tylko jeden klucz \"env\""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1471,7 +1471,7 @@ msgstr "Odświeżanie i buforowanie reguł skanera i sygnatur z sieci"
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
+msgstr "Odmowa podpisania pliku {path}, ponieważ istnieje on zarówno w folderze {dir1}, jak i {dir2}."
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
@@ -1700,7 +1700,7 @@ msgstr "Tryb testowy - umieszczaj dane wyjściowe tylko w katalogu tmp i zawsze
 
 #: ../fdroidserver/index.py
 msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
+msgstr "Pakiet Pythona „qrcode” nie jest zainstalowany (np. apt-get install python3-qrcode)!"
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
@@ -2601,7 +2601,7 @@ msgstr "{name} \"{section}/icons/{path}\" nie istnieje! Sprawdź \"config.yml\".
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
+msgstr "{path1} to duplikat {path2}, usuń jeden z nich!"
 
 #: ../fdroidserver/import_subcommand.py
 #, python-brace-format

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/locale/ru/LC_MESSAGES/fdroidserver.po

@@ -16,20 +16,21 @@
 # gfbdrgng <hnaofegnp@hldrive.com>, 2024.
 # neverender <audiolunaire@getgoogleoff.me>, 2024.
 # Dmitry <dmitrydmitry761@gmail.com>, 2024.
+# Artyom Rybakov <rib.artem@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2025-03-25 11:36+0100\n"
-"PO-Revision-Date: 2025-03-27 19:35+0000\n"
-"Last-Translator: Andrey <andrey@mailbox.org>\n"
+"PO-Revision-Date: 2025-06-24 10:15+0000\n"
+"Last-Translator: Artyom Rybakov <rib.artem@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -55,7 +56,7 @@ msgstr "У \"%s/\" нет соответствующего файла метад
 
 #: ../fdroidserver/index.py
 msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
+msgstr "Ключ \"IsPrimary\" не следует добавлять в зеркала!"
 
 #: ../fdroidserver/index.py
 #, python-brace-format
@@ -672,7 +673,7 @@ msgstr "ОШИБКА: {key} недействительный ключ!"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
+msgstr "ОШИБКА: значение {key} должно быть типа {t}!"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -699,9 +700,9 @@ msgid "Environment variable {var} from {configname} is not set!"
 msgstr "Переменная среды {var} из {configname} не установлена!"
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Переменная среды {var} из {configname} не установлена!"
+msgstr "Переменная среды {{env: {var}}} не установлена!"
 
 #: ../fdroidserver/deploy.py
 msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
@@ -943,9 +944,9 @@ msgid "Ignoring bad element in manifest: %s"
 msgstr "Проигнорировано: плохой элемент в манифесте: %s"
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} признан устаревшим; используйте {newfile}"
+msgstr "Устаревший {oldfile} игнорируется, используйте {newfile}!"
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -1153,7 +1154,7 @@ msgstr "Достигнута максимальная глубина рекур
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
+msgstr "Конфигурация зеркала для {url} содержит ключ \"IsPrimary\"!"
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
@@ -1320,7 +1321,7 @@ msgstr "Допускаются изображения только в форма
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Only accepts a single key \"env\""
-msgstr ""
+msgstr "Принимает только один ключ \"env\""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1481,7 +1482,7 @@ msgstr "Обновление и кэширование правил и сигн
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
+msgstr "Отказываюсь подписывать '{path}', файл существует как в папке {dir1}, так и в папке {dir2}."
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
@@ -1710,7 +1711,7 @@ msgstr "Тестовый режим. Все собранное попадает
 
 #: ../fdroidserver/index.py
 msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
+msgstr "Пакет Python \"qrcode\" не установлен (например, apt-get install python3-qrcode)!"
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
@@ -2611,7 +2612,7 @@ msgstr "{name}: \"{section}/icons/{path}\" не существует! Попра
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
+msgstr "{path1} дублирует {path2}, удалите один!"
 
 #: ../fdroidserver/import_subcommand.py
 #, python-brace-format

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/setup.py

@@ -70,7 +70,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='fdroidserver',
-    version='2.4.1',
+    version='2.4.3',
     description='F-Droid Server Tools',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -147,6 +147,7 @@ setup(
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         'Programming Language :: Python :: 3 :: Only',
         'Topic :: Utilities',
     ],

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/tests/test_checkupdates.py

@@ -2,7 +2,6 @@
 
 import git
 import os
-import platform
 import shutil
 import tempfile
 import time
@@ -17,6 +16,10 @@ import fdroidserver.checkupdates
 basedir = Path(__file__).parent
 
 
+@unittest.skipUnless(
+    os.path.exists('/usr/bin/dpkg'),  # easy test for "Debian-ish"
+    'checkupdates is only ever run in production on Debian.',
+)
 class CheckupdatesTest(unittest.TestCase):
     '''fdroidserver/checkupdates.py'''
 
@@ -491,10 +494,6 @@ class CheckupdatesTest(unittest.TestCase):
                 fdroidserver.checkupdates.main()
         sys_exit.assert_not_called()
 
-    @unittest.skipIf(
-        platform.system() == 'Darwin',
-        'It is difficult to configure the base system for this test.',
-    )
     def test_get_upstream_main_branch(self):
         os.chdir(self.testdir.name)
         testvalue = 'foo'

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/tests/test_metadata.py

@@ -251,6 +251,10 @@ class MetadataTest(unittest.TestCase):
             fp.write('OpenCollective: test')
         metadata.parse_metadata(yml)  # should not throw an exception
 
+    @unittest.skipIf(
+        ruamel.yaml.version_info > (0, 17, 21),
+        "TODO https://gitlab.com/fdroid/fdroidserver/-/issues/1138",
+    )
     @mock.patch('git.Repo', mock.Mock())
     @mock.patch('logging.error')
     def test_rewrite_yaml_fakeotaupdate(self, logging_error):
@@ -301,6 +305,10 @@ class MetadataTest(unittest.TestCase):
                 (Path('metadata-rewrite-yml') / file_name).read_text(encoding='utf-8'),
             )
 
+    @unittest.skipIf(
+        ruamel.yaml.version_info > (0, 17, 21),
+        "TODO https://gitlab.com/fdroid/fdroidserver/-/issues/1138",
+    )
     @mock.patch('git.Repo', mock.Mock())
     def test_rewrite_yaml_special_build_params(self):
         """Test rewriting a plain YAML metadata file without localized files."""

{fdroidserver-2.4.1 → fdroidserver-2.4.3}/tests/test_scanner.py

@@ -74,6 +74,7 @@ class ScannerTest(unittest.TestCase):
             'com.jens.automation2': 3,
             'firebase-suspect': 1,
             'org.mozilla.rocket': 2,
+            'org.piepmeyer.gauguin': 1,
             'org.tasks': 3,
             'realm': 1,
             'se.manyver': 3,