Format the coding style across the codebase using "black" and manual tweaks

The main benefit of this commit is that the use of double quotes
is now consistent.
This commit is contained in:
mprahl
2019-04-25 17:58:44 -04:00
parent 559f0dd922
commit 66c3f82160
78 changed files with 9050 additions and 7438 deletions

View File

@@ -4,37 +4,35 @@ from os import path
# declared properly somewhere/somehow
confdir = path.abspath(path.dirname(__file__))
# use parent dir as dbdir else fallback to current dir
dbdir = path.abspath(path.join(confdir, '..')) if confdir.endswith('conf') \
else confdir
dbdir = path.abspath(path.join(confdir, "..")) if confdir.endswith("conf") else confdir
class BaseConfiguration(object):
DEBUG = False
# Make this random (used to generate session keys)
SECRET_KEY = '74d9e9f9cd40e66fc6c4c2e9987dce48df3ce98542529fd0'
SQLALCHEMY_DATABASE_URI = 'sqlite:///{0}'.format(path.join(
dbdir, 'module_build_service.db'))
SECRET_KEY = "74d9e9f9cd40e66fc6c4c2e9987dce48df3ce98542529fd0"
SQLALCHEMY_DATABASE_URI = "sqlite:///{0}".format(path.join(dbdir, "module_build_service.db"))
SQLALCHEMY_TRACK_MODIFICATIONS = True
# Where we should run when running "manage.py run" directly.
HOST = '0.0.0.0'
HOST = "0.0.0.0"
PORT = 5000
# Global network-related values, in seconds
NET_TIMEOUT = 120
NET_RETRY_INTERVAL = 30
SYSTEM = 'koji'
MESSAGING = 'fedmsg' # or amq
MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.prod']
KOJI_CONFIG = '/etc/module-build-service/koji.conf'
KOJI_PROFILE = 'koji'
ARCHES = ['i686', 'armv7hl', 'x86_64']
SYSTEM = "koji"
MESSAGING = "fedmsg" # or amq
MESSAGING_TOPIC_PREFIX = ["org.fedoraproject.prod"]
KOJI_CONFIG = "/etc/module-build-service/koji.conf"
KOJI_PROFILE = "koji"
ARCHES = ["i686", "armv7hl", "x86_64"]
ALLOW_ARCH_OVERRIDE = False
KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos'
KOJI_TAG_PREFIXES = ['module', 'scrmod']
KOJI_REPOSITORY_URL = "https://kojipkgs.fedoraproject.org/repos"
KOJI_TAG_PREFIXES = ["module", "scrmod"]
KOJI_ENABLE_CONTENT_GENERATOR = True
CHECK_FOR_EOL = False
PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1'
PDC_URL = "https://pdc.fedoraproject.org/rest_api/v1"
PDC_INSECURE = False
PDC_DEVELOP = True
SCMURLS = ["https://src.fedoraproject.org/modules/"]
@@ -50,30 +48,27 @@ class BaseConfiguration(object):
ALLOW_CUSTOM_SCMURLS = False
RPMS_DEFAULT_REPOSITORY = 'https://src.fedoraproject.org/rpms/'
RPMS_DEFAULT_REPOSITORY = "https://src.fedoraproject.org/rpms/"
RPMS_ALLOW_REPOSITORY = False
RPMS_DEFAULT_CACHE = 'http://pkgs.fedoraproject.org/repo/pkgs/'
RPMS_DEFAULT_CACHE = "http://pkgs.fedoraproject.org/repo/pkgs/"
RPMS_ALLOW_CACHE = False
MODULES_DEFAULT_REPOSITORY = 'https://src.fedoraproject.org/modules/'
MODULES_DEFAULT_REPOSITORY = "https://src.fedoraproject.org/modules/"
MODULES_ALLOW_REPOSITORY = False
MODULES_ALLOW_SCRATCH = False
ALLOWED_GROUPS = set([
'packager',
# 'modularity-wg',
])
ALLOWED_GROUPS = set(["packager"])
ALLOWED_GROUPS_TO_IMPORT_MODULE = set()
# Available backends are: console and file
LOG_BACKEND = 'console'
LOG_BACKEND = "console"
# Path to log file when LOG_BACKEND is set to "file".
LOG_FILE = 'module_build_service.log'
LOG_FILE = "module_build_service.log"
# Available log levels are: debug, info, warn, error.
LOG_LEVEL = 'info'
LOG_LEVEL = "info"
# Settings for Kerberos
KRB_KEYTAB = None
@@ -81,31 +76,32 @@ class BaseConfiguration(object):
# AMQ prefixed variables are required only while using 'amq' as messaging backend
# Addresses to listen to
AMQ_RECV_ADDRESSES = ['amqps://messaging.mydomain.com/Consumer.m8y.VirtualTopic.eng.koji',
('amqps://messaging.mydomain.com/Consumer.m8y.VirtualTopic.eng.'
'module_build_service')]
AMQ_RECV_ADDRESSES = [
"amqps://messaging.mydomain.com/Consumer.m8y.VirtualTopic.eng.koji",
"amqps://messaging.mydomain.com/Consumer.m8y.VirtualTopic.eng.module_build_service",
]
# Address for sending messages
AMQ_DEST_ADDRESS = ('amqps://messaging.mydomain.com/Consumer.m8y.'
'VirtualTopic.eng.module_build_service')
AMQ_CERT_FILE = '/etc/module_build_service/msg-m8y-client.crt'
AMQ_PRIVATE_KEY_FILE = '/etc/module_build_service/msg-m8y-client.key'
AMQ_TRUSTED_CERT_FILE = '/etc/module_build_service/Root-CA.crt'
AMQ_DEST_ADDRESS = \
"amqps://messaging.mydomain.com/Consumer.m8y.VirtualTopic.eng.module_build_service"
AMQ_CERT_FILE = "/etc/module_build_service/msg-m8y-client.crt"
AMQ_PRIVATE_KEY_FILE = "/etc/module_build_service/msg-m8y-client.key"
AMQ_TRUSTED_CERT_FILE = "/etc/module_build_service/Root-CA.crt"
# Disable Client Authorization
NO_AUTH = False
CACHE_DIR = '~/modulebuild/cache'
CACHE_DIR = "~/modulebuild/cache"
class TestConfiguration(BaseConfiguration):
BUILD_LOGS_DIR = '/tmp'
BUILD_LOGS_NAME_FORMAT = 'build-{id}.log'
LOG_BACKEND = 'console'
LOG_LEVEL = 'debug'
SQLALCHEMY_DATABASE_URI = 'sqlite://'
BUILD_LOGS_DIR = "/tmp"
BUILD_LOGS_NAME_FORMAT = "build-{id}.log"
LOG_BACKEND = "console"
LOG_LEVEL = "debug"
SQLALCHEMY_DATABASE_URI = "sqlite://"
DEBUG = True
MESSAGING = 'in_memory'
PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1'
MESSAGING = "in_memory"
PDC_URL = "https://pdc.fedoraproject.org/rest_api/v1"
# Global network-related values, in seconds
NET_TIMEOUT = 3
@@ -114,19 +110,19 @@ class TestConfiguration(BaseConfiguration):
SCM_NET_TIMEOUT = 0.1
SCM_NET_RETRY_INTERVAL = 0.1
KOJI_CONFIG = './conf/koji.conf'
KOJI_PROFILE = 'staging'
SERVER_NAME = 'localhost'
KOJI_CONFIG = "./conf/koji.conf"
KOJI_PROFILE = "staging"
SERVER_NAME = "localhost"
KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos'
KOJI_REPOSITORY_URL = "https://kojipkgs.stg.fedoraproject.org/repos"
SCMURLS = ["https://src.stg.fedoraproject.org/modules/"]
AUTH_METHOD = 'oidc'
RESOLVER = 'db'
AUTH_METHOD = "oidc"
RESOLVER = "db"
ALLOWED_GROUPS_TO_IMPORT_MODULE = set(['mbs-import-module'])
GREENWAVE_DECISION_CONTEXT = 'osci_compose_gate_modules'
ALLOWED_GROUPS_TO_IMPORT_MODULE = set(["mbs-import-module"])
GREENWAVE_DECISION_CONTEXT = "osci_compose_gate_modules"
STREAM_SUFFIXES = {r'^el\d+\.\d+\.\d+\.z$': 0.1}
STREAM_SUFFIXES = {r"^el\d+\.\d+\.\d+\.z$": 0.1}
class ProdConfiguration(BaseConfiguration):
@@ -134,22 +130,22 @@ class ProdConfiguration(BaseConfiguration):
class LocalBuildConfiguration(BaseConfiguration):
LOG_LEVEL = 'debug'
MESSAGING = 'in_memory'
LOG_LEVEL = "debug"
MESSAGING = "in_memory"
ARCH_AUTODETECT = True
ARCH_FALLBACK = 'x86_64'
ARCH_FALLBACK = "x86_64"
ALLOW_CUSTOM_SCMURLS = True
RESOLVER = 'mbs'
RESOLVER = "mbs"
RPMS_ALLOW_REPOSITORY = True
MODULES_ALLOW_REPOSITORY = True
class OfflineLocalBuildConfiguration(LocalBuildConfiguration):
RESOLVER = 'local'
RESOLVER = "local"
class DevConfiguration(LocalBuildConfiguration):
DEBUG = True
LOG_BACKEND = 'console'
LOG_BACKEND = "console"