diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 14d3a319f..ac184f094 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -643,8 +643,8 @@ class Backend(): def run_postconf_scripts(self): env = {'MESON_SOURCE_ROOT': self.environment.get_source_dir(), - 'MESON_BUILD_ROOT': self.environment.get_build_dir() - } + 'MESON_BUILD_ROOT': self.environment.get_build_dir(), + } child_env = os.environ.copy() child_env.update(env) diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 691a36057..7ab3813cf 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -42,7 +42,7 @@ class XCodeBackend(backends.Backend): 'inc': 'sourcecode.c.h', 'dylib': 'compiled.mach-o.dylib', 'o': 'compiled.mach-o.objfile', - } + } self.maingroup_id = self.gen_id() self.all_id = self.gen_id() self.all_buildconf_id = self.gen_id() diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 826858d81..fb88ab441 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -44,7 +44,7 @@ known_basic_kwargs = {'install': True, 'sources': True, 'objects': True, 'native': True, - } + } # These contain kwargs supported by both static and shared libraries. These are # combined here because a library() call might be shared_library() or @@ -61,7 +61,7 @@ known_lib_kwargs.update({'version': True, # Only for shared libs 'vala_vapi': True, 'vala_gir': True, 'pic': True, # Only for static libs - }) + }) class InvalidArguments(MesonException): diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index c885afec7..046147fe7 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -112,14 +112,14 @@ if mesonlib.is_osx(): 'debugoptimized': [], 'release': [], 'minsize': [], - }) + }) else: gnulike_buildtype_linker_args.update({'plain': [], 'debug': [], 'debugoptimized': [], 'release': ['-Wl,-O1'], 'minsize': [], - }) + }) msvc_buildtype_linker_args = {'plain': [], 'debug': [], @@ -147,21 +147,21 @@ d_gdc_buildtype_args = {'plain': [], 'debugoptimized': ['-g', '-O'], 'release': ['-O3', '-frelease'], 'minsize': [], - } + } d_ldc_buildtype_args = {'plain': [], 'debug': ['-g', '-O0'], 'debugoptimized': ['-g', '-O'], 'release': ['-O3', '-release'], 'minsize': [], - } + } d_dmd_buildtype_args = {'plain': [], 'debug': ['-g'], 'debugoptimized': ['-g', '-O'], 'release': ['-O', '-release'], 'minsize': [], - } + } mono_buildtype_args = {'plain': [], 'debug': ['-debug'], diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index d62fd417c..cc242f4c4 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -253,4 +253,4 @@ forbidden_target_names = {'clean': None, 'build.ninja': None, 'scan-build': None, 'reconfigure': None, - } + } diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index 884a0d828..4daa29605 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -1463,4 +1463,4 @@ packages = {'boost': BoostDependency, 'gl': GLDependency, 'threads': ThreadDependency, 'python3': Python3Dependency, - } + } diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 0f04864a2..ac1540136 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -53,7 +53,7 @@ class TryRunResultHolder(InterpreterObject): 'compiled': self.compiled_method, 'stdout': self.stdout_method, 'stderr': self.stderr_method, - }) + }) def returncode_method(self, args, kwargs): return self.res.returncode @@ -76,7 +76,7 @@ class RunProcess(InterpreterObject): self.methods.update({'returncode': self.returncode_method, 'stdout': self.stdout_method, 'stderr': self.stderr_method, - }) + }) def run_command(self, command_array, source_dir, build_dir, subdir, in_builddir): cmd_name = command_array[0] @@ -130,7 +130,7 @@ class EnvironmentVariablesHolder(MutableInterpreterObject): self.methods.update({'set': self.set_method, 'append': self.append_method, 'prepend': self.prepend_method, - }) + }) @stringArgs def add_var(self, method, args, kwargs): @@ -162,7 +162,7 @@ class ConfigurationDataHolder(MutableInterpreterObject): 'set10': self.set10_method, 'set_quoted': self.set_quoted_method, 'has': self.has_method, - }) + }) def is_used(self): return self.used @@ -346,7 +346,7 @@ class BuildMachine(InterpreterObject): 'cpu_family': self.cpu_family_method, 'cpu': self.cpu_method, 'endian': self.endian_method, - }) + }) def cpu_family_method(self, args, kwargs): return environment.detect_cpu_family(self.compilers) @@ -375,7 +375,7 @@ class CrossMachineInfo(InterpreterObject): 'cpu': self.cpu_method, 'cpu_family': self.cpu_family_method, 'endian': self.endian_method, - }) + }) def system_method(self, args, kwargs): return self.info['system'] @@ -588,7 +588,7 @@ class SubprojectHolder(InterpreterObject): super().__init__() self.held_object = subinterpreter self.methods.update({'get_variable': self.get_variable_method, - }) + }) def get_variable_method(self, args, kwargs): if len(args) != 1: @@ -623,7 +623,7 @@ class CompilerHolder(InterpreterObject): 'first_supported_argument': self.first_supported_argument_method, 'unittest_args': self.unittest_args_method, 'symbols_have_underscore_prefix': self.symbols_have_underscore_prefix_method, - }) + }) def version_method(self, args, kwargs): return self.compiler.version @@ -1012,7 +1012,7 @@ class MesonMain(InterpreterObject): 'project_name': self.project_name_method, 'get_cross_property': self.get_cross_property_method, 'backend': self.backend_method, - }) + }) def _find_source_script(self, name, args): # Prefer scripts in the current source directory diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 2b5fcf4e1..0d3f70271 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -178,7 +178,7 @@ class Conf: 'sysconfdir', 'localstatedir', 'sharedstatedir', - ]: + ]: parr.append([key, coredata.get_builtin_option_description(key), self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)]) self.print_aligned(parr) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index b9f9ab1e4..3f88585e5 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -506,8 +506,7 @@ can not be used with the current version of glib-compiled-resources, due to scankwargs = {'output': girfile, 'input': libsources, 'command': scan_command, - 'depends': depends, - } + 'depends': depends} if kwargs.get('install'): scankwargs['install'] = kwargs['install'] scankwargs['install_dir'] = kwargs.get('install_dir_gir', diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 95932d9f5..867053377 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -130,8 +130,7 @@ class Qt4Module(): rcc_kwargs = {'input': rcc_files, 'output': name + '.cpp', 'command': [self.rcc, '-o', '@OUTPUT@', '@INPUT@'], - 'depend_files': qrc_deps, - } + 'depend_files': qrc_deps} res_target = build.CustomTarget(name, state.subdir, rcc_kwargs) sources.append(res_target) if len(ui_files) > 0: diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index eb467f746..7a9f8f50f 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -136,8 +136,7 @@ class Qt5Module(): rcc_kwargs = {'input': rcc_files, 'output': name + '.cpp', 'command': [self.rcc, '-o', '@OUTPUT@', '@INPUT@'], - 'depend_files': qrc_deps, - } + 'depend_files': qrc_deps} res_target = build.CustomTarget(name, state.subdir, rcc_kwargs) sources.append(res_target) if len(ui_files) > 0: diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index b8f57ab28..ac23fe84c 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -65,7 +65,7 @@ def ComboParser(name, description, kwargs): option_types = {'string': StringParser, 'boolean': BooleanParser, 'combo': ComboParser, - } + } class OptionInterpreter: def __init__(self, subproject, command_line_options): diff --git a/mesonbuild/scripts/commandrunner.py b/mesonbuild/scripts/commandrunner.py index 30a7da2f3..cf2770dc5 100644 --- a/mesonbuild/scripts/commandrunner.py +++ b/mesonbuild/scripts/commandrunner.py @@ -20,8 +20,8 @@ import sys, os, subprocess, shutil def run_command(source_dir, build_dir, subdir, command, arguments): env = {'MESON_SOURCE_ROOT': source_dir, 'MESON_BUILD_ROOT': build_dir, - 'MESON_SUBDIR': subdir - } + 'MESON_SUBDIR': subdir, + } cwd = os.path.join(source_dir, subdir) child_env = os.environ.copy() child_env.update(env) diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 881615ddd..676a1e589 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -146,7 +146,7 @@ def run_install_script(d): 'MESON_BUILD_ROOT': d.build_dir, 'MESON_INSTALL_PREFIX': d.prefix, 'MESON_INSTALL_DESTDIR_PREFIX': d.fullprefix, - } + } child_env = os.environ.copy() child_env.update(env) diff --git a/mesontest.py b/mesontest.py index 49a5278c2..ecf1b41b2 100755 --- a/mesontest.py +++ b/mesontest.py @@ -131,8 +131,7 @@ def write_json_log(jsonlogfile, test_name, result): 'result': result.res, 'duration': result.duration, 'returncode': result.returncode, - 'command': result.cmd, - } + 'command': result.cmd} if isinstance(result.env, dict): jresult['env'] = result.env else: diff --git a/tools/ac_converter.py b/tools/ac_converter.py index c5c499510..0531e9856 100755 --- a/tools/ac_converter.py +++ b/tools/ac_converter.py @@ -217,7 +217,7 @@ function_data = \ 'HAVE_SETJMP': ('setjmp', 'setjmp.h'), 'HAVE_PTHREAD_SETNAME_NP': ('pthread_setname_np', 'pthread.h'), 'HAVE_PTHREAD_SET_NAME_NP': ('pthread_set_name_np', 'pthread.h'), - } + } headers = [] functions = []