fdroidserver 2.4.2__tar.gz → 2.4.3__tar.gz

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

@@ -4,6 +4,13 @@ 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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.4.2
+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.2 → 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.2 → fdroidserver-2.4.3}/fdroidserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.4.2
+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.2 → fdroidserver-2.4.3}/setup.py

@@ -70,7 +70,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='fdroidserver',
-    version='2.4.2',
+    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.2 → 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.2 → 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."""