Format setup.py with Black

.gitlab-ci.yml

@@ -233,6 +233,7 @@ black:
         fdroidserver/readmeta.py
         fdroidserver/signindex.py
         fdroidserver/tail.py
+        setup.py
         tests/build.TestCase
         tests/deploy.TestCase
         tests/exception.TestCase

setup.py

@@ -1,17 +1,18 @@
 #!/usr/bin/env python3
 
-from setuptools import Command
-from setuptools import setup
 import os
 import re
 import subprocess
 import sys
 
+from setuptools import Command
+from setuptools import setup
 from setuptools.command.install import install
 
 
 class VersionCheckCommand(Command):
     """Make sure git tag and version match before uploading"""
+
     user_options = []
 
     def initialize_options(self):
@@ -22,10 +23,16 @@ class VersionCheckCommand(Command):
 
     def run(self):
         version = self.distribution.get_version()
-        version_git = subprocess.check_output(['git', 'describe', '--tags', '--always']).rstrip().decode('utf-8')
+        version_git = (
+            subprocess.check_output(['git', 'describe', '--tags', '--always'])
+            .rstrip()
+            .decode('utf-8')
+        )
         if version != version_git:
-            print('ERROR: Release version mismatch! setup.py (%s) does not match git (%s)'
+            print(
-                  % (version, version_git))
+                'ERROR: Release version mismatch! setup.py (%s) does not match git (%s)'
+                % (version, version_git)
+            )
             sys.exit(1)
         print('Upload using: twine upload --sign dist/fdroidserver-%s.tar.gz' % version)
 
@@ -33,6 +40,7 @@ class VersionCheckCommand(Command):
 class InstallWithCompile(install):
     def run(self):
         from babel.messages.frontend import compile_catalog
+
         compiler = compile_catalog(self.distribution)
         option_dict = self.distribution.get_option_dict('compile_catalog')
         compiler.domain = [option_dict['domain'][1]]
@@ -52,82 +60,84 @@ def get_data_files():
     with open('MANIFEST.in') as fp:
         data = fp.read()
 
-    data_files.append((data_prefix + '/share/doc/fdroidserver/examples',
+    data_files.append(
-                       ['buildserver/config.buildserver.yml', ]
+        (
-                       + re.findall(r'include (examples/.*)', data)))
+            data_prefix + '/share/doc/fdroidserver/examples',
+            ['buildserver/config.buildserver.yml']
+            + re.findall(r'include (examples/.*)', data),
+        )
+    )
 
-    for f in re.findall(r'include (locale/[a-z][a-z][a-zA-Z_]*/LC_MESSAGES/fdroidserver\.)po', data):
+    for f in re.findall(
+        r'include (locale/[a-z][a-z][a-zA-Z_]*/LC_MESSAGES/fdroidserver\.)po', data
+    ):
         f += 'mo'
         d = os.path.join(data_prefix, 'share', os.path.dirname(f))
-        data_files.append((d, [f, ]))
+        data_files.append((d, [f]))
     return data_files
 
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-setup(name='fdroidserver',
+setup(
-      version='2.1a0',
+    name='fdroidserver',
-      description='F-Droid Server Tools',
+    version='2.1a0',
-      long_description=long_description,
+    description='F-Droid Server Tools',
-      long_description_content_type='text/markdown',
+    long_description=long_description,
-      author='The F-Droid Project',
+    long_description_content_type='text/markdown',
-      author_email='team@f-droid.org',
+    author='The F-Droid Project',
-      url='https://f-droid.org',
+    author_email='team@f-droid.org',
-      license='AGPL-3.0',
+    url='https://f-droid.org',
-      packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
+    license='AGPL-3.0',
-      scripts=['makebuildserver'],
+    packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
-      entry_points={
+    scripts=['makebuildserver'],
-          'console_scripts': ['fdroid=fdroidserver.__main__:main']
+    entry_points={'console_scripts': ['fdroid=fdroidserver.__main__:main']},
-      },
+    data_files=get_data_files(),
-      data_files=get_data_files(),
+    python_requires='>=3.5',
-      python_requires='>=3.5',
+    cmdclass={
-      cmdclass={
+        'versioncheck': VersionCheckCommand,
-          'versioncheck': VersionCheckCommand,
+        'install': InstallWithCompile,
-          'install': InstallWithCompile,
+    },
-      },
+    setup_requires=[
-      setup_requires=[
+        'babel',
-          'babel',
+    ],
-      ],
+    install_requires=[
-      install_requires=[
+        'androguard >= 3.1.0rc2, != 3.3.0, != 3.3.1, != 3.3.2',
-          'androguard >= 3.1.0rc2, != 3.3.0, != 3.3.1, != 3.3.2',
+        'clint',
-          'clint',
+        'defusedxml',
-          'defusedxml',
+        'GitPython',
-          'GitPython',
+        'paramiko',
-          'paramiko',
+        'Pillow',
-          'Pillow',
+        'apache-libcloud >= 0.14.1',
-          'apache-libcloud >= 0.14.1',
+        'pyasn1 >=0.4.1, < 0.5.0',
-          'pyasn1 >=0.4.1, < 0.5.0',
+        'pyasn1-modules >= 0.2.1, < 0.3',
-          'pyasn1-modules >= 0.2.1, < 0.3',
+        'python-vagrant',
-          'python-vagrant',
+        'PyYAML',
-          'PyYAML',
+        'qrcode',
-          'qrcode',
+        'ruamel.yaml >= 0.15',
-          'ruamel.yaml >= 0.15',
+        'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
-          'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
+        'yamllint',
-          'yamllint',
+    ],
-      ],
+    extras_require={
-      extras_require={
+        'test': ['pyjks', 'html5print'],
-          'test': [
+        'docs': [
-              'pyjks',
+            'sphinx',
-              'html5print'
+            'numpydoc',
-              ],
+            'pydata_sphinx_theme',
-          'docs': [
+            'pydocstyle',
-              'sphinx',
+        ],
-              'numpydoc',
+    },
-              'pydata_sphinx_theme',
+    classifiers=[
-              'pydocstyle',
+        'Development Status :: 4 - Beta',
-          ]
+        'Intended Audience :: Developers',
-      },
+        'Intended Audience :: Information Technology',
-      classifiers=[
+        'Intended Audience :: System Administrators',
-          'Development Status :: 4 - Beta',
+        'Intended Audience :: Telecommunications Industry',
-          'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
-          'Intended Audience :: Information Technology',
+        'Operating System :: POSIX',
-          'Intended Audience :: System Administrators',
+        'Operating System :: MacOS :: MacOS X',
-          'Intended Audience :: Telecommunications Industry',
+        'Operating System :: Unix',
-          'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+        'Topic :: Utilities',
-          'Operating System :: POSIX',
+    ],
-          'Operating System :: MacOS :: MacOS X',
+)
-          'Operating System :: Unix',
-          'Topic :: Utilities',
-      ],
-      )