Sort import

ruff check --fix --select I

tests/dump_internal_metadata_format.py

@@ -25,7 +25,6 @@ import sys
 from argparse import ArgumentParser
 
 import git
-
 import yaml
 
 localmodule = os.path.realpath(

tests/extra/manual-vmtools-test.py

@@ -4,12 +4,12 @@
 # that run in the buildserver setup.  It is not really maintained, but
 # is still here as a kind of reference.
 
+import inspect
+import logging
 import os
 import sys
-import logging
-import textwrap
 import tempfile
-import inspect
+import textwrap
 from argparse import ArgumentParser
 
 localmodule = os.path.realpath(

tests/get-country-region-data.py

@@ -5,11 +5,12 @@
 import collections
 import os
 import re
-import requests
-import requests_cache
 import sys
 import tempfile
 
+import requests
+import requests_cache
+
 
 def main():
     # we want all the data

tests/gradle-release-checksums.py

@@ -2,13 +2,13 @@
 
 import os
 import re
-import requests
 import subprocess
 import sys
+
+import requests
 from colorama import Fore, Style
 from packaging.version import Version
 
-
 checksums = None
 versions = dict()
 

tests/key-tricks.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 
 import os
-import fdroidserver
 import shutil
 import sys
+
+import fdroidserver
 from fdroidserver import common, nightly
 
 if os.getenv('CI') is None:

tests/openssl-version-check-test.py

@@ -6,6 +6,7 @@
 # This is used in update.has_known_vulnerability()
 
 import re
+
 import requests
 
 # this list was generated using:

tests/shared_test_code.py

@@ -20,10 +20,8 @@ import sys
 import tempfile
 import unittest
 import unittest.mock
-
 from pathlib import Path
 
-
 GP_FINGERPRINT = 'B7C2EEFD8DAC7806AF67DFCD92EB18126BC08312A7F2D6F3862E46013C7A6135'
 
 

tests/test_api.py

@@ -8,8 +8,8 @@ from unittest import mock
 
 import fdroidserver
 from fdroidserver import common, signindex
-from .shared_test_code import GP_FINGERPRINT, mkdtemp
 
+from .shared_test_code import GP_FINGERPRINT, mkdtemp
 
 basedir = Path(__file__).parent
 

tests/test_build.py

@@ -6,15 +6,16 @@ import sys
 import tempfile
 import textwrap
 import unittest
-import yaml
 from pathlib import Path
 from unittest import mock
 
-from .shared_test_code import TmpCwd, mkdtemp
+import yaml
 
 import fdroidserver.build
 import fdroidserver.common
 
+from .shared_test_code import TmpCwd, mkdtemp
+
 
 class FakeProcess:
     output = 'fake output'

tests/test_checkupdates.py

@@ -1,19 +1,19 @@
 #!/usr/bin/env python3
 
-import git
 import os
 import platform
 import shutil
 import tempfile
 import time
 import unittest
-from unittest import mock
 from pathlib import Path
+from unittest import mock
+
+import git
 
 import fdroidserver
 import fdroidserver.checkupdates
 
-
 basedir = Path(__file__).parent
 
 

tests/test_common.py

@@ -1,40 +1,44 @@
 #!/usr/bin/env python3
 
 import difflib
-import git
 import glob
+import gzip
 import importlib
 import json
 import logging
 import os
 import re
-import ruamel.yaml
 import shutil
 import subprocess
 import sys
 import tempfile
+import textwrap
 import time
 import unittest
-import textwrap
-import gzip
 from argparse import ArgumentParser
 from datetime import datetime, timezone
-from zipfile import BadZipFile, ZipFile
-from unittest import mock
 from pathlib import Path
+from unittest import mock
+from zipfile import BadZipFile, ZipFile
 
+import git
+import ruamel.yaml
 
 import fdroidserver
-import fdroidserver.signindex
 import fdroidserver.common
 import fdroidserver.metadata
-from .shared_test_code import TmpCwd, mkdtemp, mkdir_testfiles
+import fdroidserver.signindex
+from fdroidserver._yaml import config_dump, yaml, yaml_dumper
 from fdroidserver.common import ANTIFEATURES_CONFIG_NAME, CATEGORIES_CONFIG_NAME
-from fdroidserver._yaml import yaml, yaml_dumper, config_dump
-from fdroidserver.exception import FDroidException, VCSException,\
-    MetaDataException, VerificationException
+from fdroidserver.exception import (
+    FDroidException,
+    MetaDataException,
+    VCSException,
+    VerificationException,
+)
 from fdroidserver.looseversion import LooseVersion
 
+from .shared_test_code import TmpCwd, mkdir_testfiles, mkdtemp
 
 basedir = Path(__file__).parent
 
@@ -2415,9 +2419,10 @@ class CommonTest(SetUpTearDownMixin, unittest.TestCase):
     @mock.patch('sdkmanager._generate_package_xml', lambda a, b, c: None)
     def test_auto_install_ndk_mock_dl(self):
         """Test NDK installs by actually calling sdkmanager"""
-        import sdkmanager
         import importlib.metadata
 
+        import sdkmanager
+
         sdkmanager_version = LooseVersion(importlib.metadata.version('sdkmanager'))
         if sdkmanager_version < LooseVersion('0.6.4'):
             raise unittest.SkipTest('needs fdroid sdkmanager >= 0.6.4')

tests/test_deploy.py

@@ -11,7 +11,8 @@ from unittest import mock
 import git
 
 import fdroidserver
-from .shared_test_code import TmpCwd, mkdtemp, VerboseFalseOptions
+
+from .shared_test_code import TmpCwd, VerboseFalseOptions, mkdtemp
 
 basedir = Path(__file__).parent
 

tests/test_exception.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import unittest
+
 import fdroidserver
 
 

tests/test_github.py

@@ -3,9 +3,10 @@
 import unittest
 import unittest.mock
 
-from .shared_test_code import mock_urlopen
 import fdroidserver
 
+from .shared_test_code import mock_urlopen
+
 
 class GithubApiTest(unittest.TestCase):
     def test__init(self):

tests/test_gpgsign.py

@@ -5,11 +5,11 @@ import os
 import shutil
 import tempfile
 import unittest
-
-from fdroidserver import common, gpgsign
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
+from fdroidserver import common, gpgsign
+
 basedir = Path(__file__).parent
 
 

tests/test_import_subcommand.py

@@ -13,11 +13,11 @@ import git
 import requests
 import yaml
 
-from .shared_test_code import TmpCwd, mkdtemp, VerboseFalseOptions
-
 import fdroidserver
 import fdroidserver.import_subcommand
 
+from .shared_test_code import TmpCwd, VerboseFalseOptions, mkdtemp
+
 basedir = Path(__file__).parent
 logging.basicConfig(level=logging.DEBUG)
 

tests/test_index.py

@@ -3,21 +3,22 @@
 import copy
 import datetime
 import glob
-import os
-import unittest
-from pathlib import Path
-import yaml
-import zipfile
-from unittest.mock import patch
-import requests
-import tempfile
 import json
+import os
 import shutil
+import tempfile
+import unittest
+import zipfile
+from pathlib import Path
+from unittest.mock import patch
+
+import requests
+import yaml
 
 import fdroidserver
 from fdroidserver import common, index, publish, signindex, update
-from .shared_test_code import GP_FINGERPRINT, TmpCwd, mkdtemp
 
+from .shared_test_code import GP_FINGERPRINT, TmpCwd, mkdtemp
 
 basedir = Path(__file__).parent
 

tests/test_init.py

@@ -8,6 +8,7 @@ import unittest
 
 import fdroidserver.common
 import fdroidserver.init
+
 from .shared_test_code import mkdtemp
 
 basedir = pathlib.Path(__file__).parent

tests/test_install.py

@@ -3,7 +3,6 @@
 import os
 import textwrap
 import unittest
-
 from pathlib import Path
 from unittest.mock import Mock, patch
 

tests/test_integration.py

@@ -18,6 +18,7 @@ except ModuleNotFoundError:
     from androguard.core.apk import get_apkid
 
 from fdroidserver._yaml import yaml, yaml_dumper
+
 from .shared_test_code import mkdir_testfiles
 
 # TODO: port generic tests that use index.xml to index-v2 (test that

tests/test_lint.py

@@ -9,13 +9,13 @@ import unittest
 from pathlib import Path
 from unittest import mock
 
-from .shared_test_code import mkdtemp
-
 import fdroidserver.common
 import fdroidserver.lint
 import fdroidserver.metadata
 from fdroidserver._yaml import config_dump
 
+from .shared_test_code import mkdtemp
+
 basedir = Path(__file__).parent
 
 

tests/test_main.py

@@ -2,12 +2,13 @@
 
 import os
 import pkgutil
+import tempfile
 import textwrap
 import unittest
-import tempfile
 from unittest import mock
 
 import fdroidserver.__main__
+
 from .shared_test_code import TmpCwd, TmpPyPath
 
 

tests/test_metadata.py

@@ -4,22 +4,23 @@ import copy
 import io
 import os
 import random
-import ruamel.yaml
 import shutil
-import unittest
 import tempfile
 import textwrap
+import unittest
 from collections import OrderedDict
 from pathlib import Path
 from unittest import mock
 
+import ruamel.yaml
+
 import fdroidserver
 from fdroidserver import metadata
-from fdroidserver.exception import MetaDataException
-from fdroidserver.common import DEFAULT_LOCALE
 from fdroidserver._yaml import yaml
-from .shared_test_code import TmpCwd, mkdtemp
+from fdroidserver.common import DEFAULT_LOCALE
+from fdroidserver.exception import MetaDataException
 
+from .shared_test_code import TmpCwd, mkdtemp
 
 basedir = Path(__file__).parent
 

tests/test_net.py

@@ -2,16 +2,17 @@
 
 import os
 import random
-import requests
 import socket
 import tempfile
 import threading
 import time
 import unittest
+from pathlib import Path
 from unittest.mock import MagicMock, patch
 
+import requests
+
 from fdroidserver import net
-from pathlib import Path
 
 
 class RetryServer:

tests/test_nightly.py

@@ -2,19 +2,18 @@
 
 import os
 import platform
-import requests
 import shutil
 import subprocess
 import tempfile
 import time
 import unittest
-import yaml
-
 from pathlib import Path
 from unittest.mock import patch
 
-from fdroidserver import common, exception, index, nightly
+import requests
+import yaml
 
+from fdroidserver import common, exception, index, nightly
 
 DEBUG_KEYSTORE = '/u3+7QAAAAIAAAABAAAAAQAPYW5kcm9pZGRlYnVna2V5AAABNYhAuskAAAK8MIICuDAOBgorBgEEASoCEQEBBQAEggKkqRnFlhidQmVff83bsAeewXPIsF0jiymzJnvrnUAQtCK0MV9uZonu37Mrj/qKLn56mf6QcvEoKvpCstZxzftgYYpAHWMVLM+hy2Z707QZEHlY7Ukppt8DItj+dXkeqGt7f8KzOb2AQwDbt9lm1fJb+MefLowTaubtvrLMcKIne43CbCu2D8HyN7RPWpEkVetA2Qgr5W4sa3tIUT80afqo9jzwJjKCspuxY9A1M8EIM3/kvyLo2B9r0cuWwRjYZXJ6gmTYI2ARNz0KQnCZUok14NDg+mZTb1B7AzRfb0lfjbA6grbzuAL+WaEpO8/LgGfuOh7QBZBT498TElOaFfQ9toQWA79wAmrQCm4OoFukpPIy2m/l6VjJSmlK5Q+CMOl/Au7OG1sUUCTvPaIr0XKnsiwDJ7a71n9garnPWHkvuWapSRCzCNgaUoGQjB+fTMJFFrwT8P1aLfM6onc3KNrDStoQZuYe5ngCLlNS56bENkVGvJBfdkboxtHZjqDXXON9jWGSOI527J3o2D5sjSVyx3T9XPrsL4TA/nBtdU+c/+M6aoASZR2VymzAKdMrGfj9kE5GXp8vv2vkJj9+OJ4Jm5yeczocc/Idtojjb1yg+sq1yY8kAQxgezpY1rpgi2jF3tSN01c23DNvAaSJLJX2ZuH8sD40ACc80Y1Qp1nUTdpwBZUeaeNruBwx4PHU8GnC71FwtiUpwNs0OoSl0pgDUJ3ODC5bs8B5QmW1wu1eg7I4mMSmCsNGW6VN3sFcu+WEqnmTxPoZombdFZKxsr2oq359Nn4bJ6Uc9PBz/sXsns7Zx1vND/oK/Jv5Y269UVAMeKX/eGpfnxzagW3tqGbOu12C2p9Azo5VxiU2fG/tmk2PjaG5hV/ywReco7I6C1p8OWM2fwAAAAEABVguNTA5AAAB6TCCAeUwggFOoAMCAQICBE89gTUwDQYJKoZIhvcNAQEFBQAwNzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0FuZHJvaWQxFjAUBgNVBAMTDUFuZHJvaWQgRGVidWcwHhcNMTIwMjE2MjIyMDM3WhcNNDIwMjA4MjIyMDM3WjA3MQswCQYDVQQGEwJVUzEQMA4GA1UEChMHQW5kcm9pZDEWMBQGA1UEAxMNQW5kcm9pZCBEZWJ1ZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3AKU7S7JXhUjEwxWP1/LPHXieh61SaA/+xbpqsPA+yjGz1sAcGAyuG6bjNAVm56pq7nkjJzicX7Wi83nUBo58DEC/quxOLdy0C4PEOSAeTnTT1RJIwMDvOgiL1GFCErvQ7gCH6zuAID/JRFbN6nIkhDjs2DYnSBl7aJJf8wCLc0CAwEAATANBgkqhkiG9w0BAQUFAAOBgQAoq/TJffA0l+ZGf89xndmHdxrO6qi+TzSlByvLZ4eFfCovTh1iO+Edrd5V1yXGLxyyvdsadMAFZT8SaxMrP5xxhJ0nra0APWYLpA96M//auMhQBWPgqPntwgvEZuEH7f0kdItjBJ39yijbG8xfgwid6XqNUo0TDDkp/wNWKpJ9tJe+2PrGw1NAvrgSydoH2j8DI1Eq'
 DEBUG_KEYSTORE_KEY_FILE_NAME = (

tests/test_publish.py

@@ -15,17 +15,15 @@ import os
 import pathlib
 import shutil
 import sys
-import unittest
 import tempfile
+import unittest
 from unittest import mock
 
-from fdroidserver import publish
-from fdroidserver import common
-from fdroidserver import metadata
-from fdroidserver import signatures
+from fdroidserver import common, metadata, publish, signatures
 from fdroidserver._yaml import yaml
 from fdroidserver.exception import FDroidException
-from .shared_test_code import mkdtemp, VerboseFalseOptions
+
+from .shared_test_code import VerboseFalseOptions, mkdtemp
 
 basedir = pathlib.Path(__file__).parent
 

tests/test_rewritemeta.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 
 import os
-import unittest
 import tempfile
 import textwrap
+import unittest
 from pathlib import Path
 from unittest import mock
 
 from fdroidserver import metadata, rewritemeta
+
 from .shared_test_code import TmpCwd, mkdtemp
 
 basedir = Path(__file__).parent

tests/test_scanner.py

@@ -26,6 +26,7 @@ import fdroidserver.common
 import fdroidserver.exception
 import fdroidserver.metadata
 import fdroidserver.scanner
+
 from .shared_test_code import TmpCwd, mkdtemp, mock_open_to_str
 
 basedir = pathlib.Path(__file__).parent

tests/test_signatures.py

@@ -6,9 +6,10 @@ import sys
 import unittest
 from tempfile import TemporaryDirectory
 
-from .shared_test_code import TmpCwd
 from fdroidserver import common, signatures
 
+from .shared_test_code import TmpCwd
+
 basedir = os.path.dirname(__file__)
 
 

tests/test_signindex.py

@@ -6,11 +6,11 @@ import shutil
 import subprocess
 import tempfile
 import unittest
-
-from fdroidserver import apksigcopier, common, exception, signindex, update
 from pathlib import Path
 from unittest.mock import patch
 
+from fdroidserver import apksigcopier, common, exception, signindex, update
+
 
 class Options:
     allow_disabled_algorithms = False

tests/test_update.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import copy
-import git
 import glob
 import hashlib
 import json
@@ -12,16 +11,18 @@ import shutil
 import string
 import subprocess
 import sys
+import textwrap
 import time
 import unittest
-import yaml
 import zipfile
-import textwrap
 from binascii import hexlify
 from datetime import datetime
 from pathlib import Path
 from unittest import mock
 
+import git
+import yaml
+
 try:
     # these were moved in androguard 4.0
     from androguard.core.apk import APK
@@ -44,15 +45,16 @@ except ImportError:
     except ImportError:
         from yaml import Loader as FullLoader
 
+from PIL import PngImagePlugin
+
 import fdroidserver.common
 import fdroidserver.exception
 import fdroidserver.metadata
 import fdroidserver.update
 from fdroidserver.common import CATEGORIES_CONFIG_NAME
 from fdroidserver.looseversion import LooseVersion
-from .shared_test_code import TmpCwd, mkdtemp
-from PIL import PngImagePlugin
 
+from .shared_test_code import TmpCwd, mkdtemp
 
 DONATION_FIELDS = ('Donate', 'Liberapay', 'OpenCollective')
 

tests/test_vcs.py

@@ -7,7 +7,8 @@ from git import Repo
 
 import fdroidserver.common
 import fdroidserver.metadata
-from .shared_test_code import mkdtemp, VerboseFalseOptions
+
+from .shared_test_code import VerboseFalseOptions, mkdtemp
 
 
 class VCSTest(unittest.TestCase):

tests/test_verify.py

@@ -6,13 +6,11 @@ import shutil
 import sys
 import tempfile
 import unittest
-
 from pathlib import Path
 from unittest.mock import patch
 
 from fdroidserver import verify
 
-
 TEST_APP_ENTRY = {
     "1539780240.3885746": {
         "local": {