mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 14:30:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

port to looseversion

Browse source
This commit is contained in:
Hans-Christoph Steiner 2023-12-08 09:48:11 +01:00
parent 4b208e438e
commit e2949cbd61
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/common.TestCase
View file

@ -21,7 +21,6 @@ import unittest
import textwrap
import yaml
import gzip
from packaging.version import Version
from zipfile import BadZipFile, ZipFile
from unittest import mock
from pathlib import Path
@ -42,6 +41,7 @@ from testcommon import TmpCwd, mkdtemp
from fdroidserver.common import ANTIFEATURES_CONFIG_NAME, CATEGORIES_CONFIG_NAME
from fdroidserver.exception import FDroidException, VCSException,\
MetaDataException, VerificationException
from fdroidserver.looseversion import LooseVersion
class CommonTest(unittest.TestCase):
@ -852,9 +852,9 @@ class CommonTest(unittest.TestCase):
v = bt.split('/')[-2]
if v == 'debian':
continue
if Version(version) < Version(v):
if LooseVersion(version) < LooseVersion(v):
version = v
if Version(version) < Version(min_version):
if LooseVersion(version) < LooseVersion(min_version):
self.skipTest('SKIPPING since build-tools %s or higher is required!' % min_version)
fdroidserver.common.config = {'sdk_path': android_home}
with mock.patch.dict(os.environ, clear=True):
@ -2374,10 +2374,10 @@ class CommonTest(unittest.TestCase):
import sdkmanager
import pkg_resources
sdkmanager_version = Version(
sdkmanager_version = LooseVersion(
pkg_resources.get_distribution('sdkmanager').version
)
if sdkmanager_version < Version('0.6.4'):
if sdkmanager_version < LooseVersion('0.6.4'):
raise unittest.SkipTest('needs fdroid sdkmanager >= 0.6.4')
fdroidserver.common.config = {'sdk_path': 'placeholder'}

4
tests/update.TestCase
View file

@ -21,7 +21,6 @@ import yaml
import zipfile
import textwrap
from datetime import datetime
from packaging.version import Version
from pathlib import Path
from testcommon import TmpCwd, mkdtemp
from unittest import mock
@ -54,6 +53,7 @@ import fdroidserver.exception
import fdroidserver.metadata
import fdroidserver.update
from fdroidserver.common import CATEGORIES_CONFIG_NAME
from fdroidserver.looseversion import LooseVersion
DONATION_FIELDS = ('Donate', 'Liberapay', 'OpenCollective')
@ -1041,7 +1041,7 @@ class UpdateTest(unittest.TestCase):
javac = config['jarsigner'].replace('jarsigner', 'javac')
v = subprocess.check_output([javac, '-version'], stderr=subprocess.STDOUT)[6:-1].decode('utf-8')
if Version(v) < Version('1.8.0_132'):
if LooseVersion(v) < LooseVersion('1.8.0_132'):
print('SKIPPING: running tests with old Java (' + v + ')')
return