bug 1478338 - Fix some flake8 regression in moz.configure/ r=froydnj
☠☠ backed out by 766820943ced ☠ ☠
authorSylvestre Ledru <sledru@mozilla.com>
Wed, 25 Jul 2018 13:43:58 +0000
changeset 428338 4738f8111a82b484239f233967246be4e6bdbefd
parent 428337 a1b1af182dfa9208eaca66dfc6b21cd9973abc40
child 428339 bf63176221f0c8dff2f35f7ee2716c0ef4e6afc6
push id34331
push usercsabou@mozilla.com
push dateWed, 25 Jul 2018 18:21:09 +0000
treeherdermozilla-central@fc6b465453aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1478338
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1478338 - Fix some flake8 regression in moz.configure/ r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D2356
.flake8
build/moz.configure/toolchain.configure
build/moz.configure/tup.configure
--- a/.flake8
+++ b/.flake8
@@ -1,16 +1,15 @@
 [flake8]
 # See http://pep8.readthedocs.io/en/latest/intro.html#configuration
 ignore = E121, E123, E126, E129, E133, E226, E241, E242, E704, W503, E402, E741
 max-line-length = 99
 exclude =
     browser/extensions/mortar/ppapi/,
     browser/moz.configure,
-    build/moz.configure/*.configure,
     build/pymake/,
     dom/canvas/test/webgl-conf/checkout/closure-library/,
     editor/libeditor/tests/browserscope/,
     intl/icu/,
     ipc/chromium/,
     gfx/angle/,
     gfx/harfbuzz,
     glx/skia/,
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1345,17 +1345,17 @@ def lto(value, pgo, c_compiler):
                 ldflags.append("-flto=thin")
         elif c_compiler.type == 'clang-cl':
             if len(value) and value[0].lower() == 'full':
                 cflags.append("-flto")
             else:
                 cflags.append("-flto=thin")
             # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
             # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
-            cflags.append("-fuse-ld=lld");
+            cflags.append("-fuse-ld=lld")
         else:
             num_cores = multiprocessing.cpu_count()
             cflags.append("-flto")
             cflags.append("-flifetime-dse=1")
 
             ldflags.append("-flto=%s" % num_cores)
             ldflags.append("-flifetime-dse=1")
 
--- a/build/moz.configure/tup.configure
+++ b/build/moz.configure/tup.configure
@@ -4,16 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # tup detection
 # ==============================================================
 
 tup = check_prog('TUP', ['tup'])
 
+
 @depends(tup)
 @checking('for tup version')
 @imports('re')
 def tup_version(tup):
     tup_min_version = '0.7.6'
     out = check_cmd_output(tup, '--version',
                            onerror=lambda: die('Failed to get tup version'))
     m = re.search(r'tup v?([0-9]+\.[0-9]+\.[0-9]+)', out)
@@ -22,50 +23,57 @@ def tup_version(tup):
         raise FatalCheckError('Unknown version of tup: %s' % out)
     ver = Version(m.group(1))
 
     if ver < tup_min_version:
         raise FatalCheckError('To use the tup backend you must have tup version '
                               '%s or greater in your path' % tup_min_version)
     return ver
 
+
 @depends(tup)
 @checking('for tup ldpreload dependency checker')
 def tup_is_ldpreload(tup):
     out = check_cmd_output(tup, 'server',
                            onerror=lambda: die('Failed to get tup dependency checker'))
     if out.rstrip() != 'ldpreload':
         raise FatalCheckError('To use the tup backend, please use a version '
                               'of tup compiled with the ldpreload dependency '
                               'checker. Either compile tup locally with '
                               'CONFIG_TUP_SERVER=ldpreload in your tup.config '
                               'file, or use the version from the toolchain '
                               'task via |./mach artifact toolchain '
                               '--from-build linux64-tup|')
     return True
 
+
 @depends(tup, using_sccache)
 def tup_and_sccache(tup, using_sccache):
     if tup and using_sccache:
         die('Cannot use sccache with tup yet. Please disable sccache or use '
             'the make backend until it is supported.')
 
+
 @depends(tup, rustc_info)
 def check_tup_min_rustc_version(tup, rustc_info):
     min_rustc_version = Version('1.28.0')
     if tup and rustc_info.version < min_rustc_version:
         die('Cannot build with tup and rustc %s. please update to at least '
             'rustc %s to continue.', rustc_info.version, min_rustc_version)
 
+
 @depends(tup, target, build_project)
 def tup_and_non_linux(tup, target, build_project):
     if tup and (target.kernel != 'Linux' or build_project != 'browser'):
         die('The tup backend can only be used to build the browser on Linux. '
             'Use the make backend until your target is supported.')
 
-option('--upload-tup-db', help= 'Upload the tup database from an automated build.')
+
+option('--upload-tup-db', help='Upload the tup database from an automated build.')
+
 
 @depends('--upload-tup-db')
 def upload_tdb(value):
     if value:
         return True
 
+
 set_config('UPLOAD_TUP_DB', upload_tdb)