kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00
Code Activity

Merge branch 'fix-ci' into 'master'

Browse Source 
fix the current crop of new CI failures

See merge request fdroid/fdroidserver!1327
This commit is contained in:
Jochen Sprickerhof 2023-03-20 14:28:21 +00:00
commit 99be8d679d
22 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fdroidserver/build.py
View File

@ -888,7 +888,6 @@ timeout_event = threading.Event()
def main():
global options, config, buildserverid, fdroidserverid
options, parser = parse_commandline()

1
fdroidserver/checkupdates.py
View File

@ -590,7 +590,6 @@ start_timestamp = time.gmtime()
def main():
global config, options
# Parse command line...

10
fdroidserver/common.py
View File

@ -51,11 +51,7 @@ import tempfile
import json
from pathlib import Path
# TODO change to only import defusedxml once its installed everywhere
try:
import defusedxml.ElementTree as XMLElementTree
except ImportError:
import xml.etree.ElementTree as XMLElementTree # nosec this is a fallback only
import defusedxml.ElementTree as XMLElementTree
from base64 import urlsafe_b64encode
from binascii import hexlify
@ -4239,8 +4235,8 @@ def auto_install_ndk(build):
for n in ndk:
_install_ndk(n)
else:
BuildException(_('Invalid ndk: entry in build: "{ndk}"')
.format(ndk=str(ndk)))
raise BuildException(_('Invalid ndk: entry in build: "{ndk}"')
.format(ndk=str(ndk)))
def _install_ndk(ndk):

1
fdroidserver/gpgsign.py
View File

@ -42,7 +42,6 @@ def status_update_json(signed):
def main():
global config, options
# Parse command line...

1
fdroidserver/import_subcommand.py
View File

@ -183,7 +183,6 @@ def get_app_from_url(url):
def main():
global config, options
# Parse command line...

1
fdroidserver/init.py
View File

@ -49,7 +49,6 @@ def disable_in_config(key, value):
def main():
global options, config
# Parse command line...

1
fdroidserver/install.py
View File

@ -44,7 +44,6 @@ def devices():
def main():
global options, config
# Parse command line...

2
fdroidserver/lint.py
View File

@ -697,7 +697,6 @@ def check_updates_ucm_http_aum_pattern(app): # noqa: D403
def main():
global config, options
# Parse command line...
@ -754,7 +753,6 @@ def main():
# only run yamllint when linting individual apps.
if options.appid or options.force_yamllint:
# run yamllint on app metadata
ymlpath = Path('metadata') / (appid + '.yml')
if ymlpath.is_file():

1
fdroidserver/nightly.py
View File

@ -160,7 +160,6 @@ def get_repo_base_url(clone_url, repo_git_base, force_type=None):
def main():
parser = ArgumentParser()
common.setup_global_opts(parser)
parser.add_argument(

1
fdroidserver/readmeta.py
View File

@ -24,7 +24,6 @@ options = None
def main():
parser = ArgumentParser()
common.setup_global_opts(parser)
metadata.add_metadata_arguments(parser)

1
fdroidserver/rewritemeta.py
View File

@ -45,7 +45,6 @@ def proper_format(app):
def main():
global config, options
parser = ArgumentParser()

1
fdroidserver/signindex.py
View File

@ -175,7 +175,6 @@ def status_update_json(signed):
def main():
global config, options
parser = ArgumentParser()

1
fdroidserver/update.py
View File

@ -2150,7 +2150,6 @@ start_timestamp = time.gmtime()
def main():
global config, options
# Parse command line...

3
fdroidserver/verify.py
View File

@ -146,7 +146,6 @@ def write_json_report(url, remote_apk, unsigned_apk, compare_result):
def main():
global options, config
# Parse command line...
@ -192,7 +191,6 @@ def main():
vercodes = common.read_pkg_args(options.appid, True)
for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))):
apkfilename = os.path.basename(apkfile)
url = 'https://f-droid.org/repo/' + apkfilename
appid, vercode = common.publishednameinfo(apkfile)
@ -205,7 +203,6 @@ def main():
processed.add(appid)
try:
logging.info("Processing {apkfilename}".format(apkfilename=apkfilename))
remote_apk = os.path.join(tmp_dir, apkfilename)

2
pyproject.toml
View File

@ -52,6 +52,8 @@ confidence = ["HIGH", "INFERENCE"]
# TODO many of these could be fixed if someone wants to spend the time
disable = [
"broad-exception-caught",
"broad-exception-raised",
"consider-iterating-dictionary",
"consider-using-sys-exit",
"invalid-name",

1
tests/build.TestCase
View File

@ -442,7 +442,6 @@ class BuildTest(unittest.TestCase):
self.assertEqual(0, count, "Shouldn't error on jar from extlib")
def test_failed_verifies_are_not_in_unsigned(self):
os.chdir(self.testdir)
sdk_path = os.path.join(self.testdir, 'android-sdk')
self.create_fake_android_home(sdk_path)

2
tests/deploy.TestCase
View File

@ -31,7 +31,6 @@ class DeployTest(unittest.TestCase):
fdroidserver.deploy.config = {}
def test_update_serverwebroot_make_cur_version_link(self):
# setup parameters for this test run
fdroidserver.deploy.options.no_chcksum = True
fdroidserver.deploy.options.identity_file = None
@ -123,7 +122,6 @@ class DeployTest(unittest.TestCase):
self.assertEqual(call_iteration, 3, 'expected 3 invocations of subprocess.call')
def test_update_serverwebroot_with_id_file(self):
# setup parameters for this test run
fdroidserver.deploy.options.no_chcksum = False
fdroidserver.deploy.options.verbose = True

1
tests/lint.TestCase
View File

@ -171,7 +171,6 @@ class LintTest(unittest.TestCase):
}
for field, values in fields.items():
for bad in values['bad']:
anywarns = False
app[field] = bad

1
tests/nightly.TestCase
View File

@ -48,7 +48,6 @@ class Options:
class NightlyTest(unittest.TestCase):
basedir = Path(__file__).resolve().parent
path = os.environ['PATH']

1
tests/rewritemeta.TestCase
View File

@ -32,7 +32,6 @@ class RewriteMetaTest(unittest.TestCase):
os.chdir(self.basedir)
def test_rewrite_scenario_trivial(self):
sys.argv = ['rewritemeta', 'a', 'b']
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):

1
tests/signindex.TestCase
View File

@ -34,7 +34,6 @@ class Options:
class SignindexTest(unittest.TestCase):
basedir = Path(__file__).resolve().parent
def setUp(self):

1
tests/verify.TestCase
View File

@ -48,7 +48,6 @@ TEST_APP_ENTRY = {
class VerifyTest(unittest.TestCase):
basedir = Path(__file__).resolve().parent
def setUp(self):