Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-10-02 03:15:51 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-10-02 04:59:16 +0300
commit41d2d6da0c96d351b47acb64d3e0decdba16cb16 (patch)
tree8f955ed71d907ab9f7ee97627a9a7c91192d139a /build_files/buildbot
parentbab9de2a52929fe2b45ecddb1eb09da3378e303b (diff)
Cleanup: pep8 (indentation, spacing, long lines)
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/buildbot_utils.py11
-rw-r--r--build_files/buildbot/codesign/archive_with_indicator.py2
-rw-r--r--build_files/buildbot/worker_pack.py8
-rw-r--r--build_files/buildbot/worker_test.py2
4 files changed, 14 insertions, 9 deletions
diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py
index 919b197b380..2fce979466e 100644
--- a/build_files/buildbot/buildbot_utils.py
+++ b/build_files/buildbot/buildbot_utils.py
@@ -50,22 +50,23 @@ class Builder:
# Detect platform
if name.startswith('mac'):
self.platform = 'mac'
- self.command_prefix = []
+ self.command_prefix = []
elif name.startswith('linux'):
self.platform = 'linux'
if is_tool('scl'):
- self.command_prefix = ['scl', 'enable', 'devtoolset-9', '--']
+ self.command_prefix = ['scl', 'enable', 'devtoolset-9', '--']
else:
- self.command_prefix = []
+ self.command_prefix = []
elif name.startswith('win'):
self.platform = 'win'
- self.command_prefix = []
+ self.command_prefix = []
else:
raise ValueError('Unkonw platform for builder ' + self.platform)
# Always 64 bit now
self.bits = 64
+
def create_builder_from_arguments():
parser = argparse.ArgumentParser()
parser.add_argument('builder_name')
@@ -106,7 +107,7 @@ class VersionInfo:
def _parse_header_file(self, filename, define):
import re
- regex = re.compile("^#\s*define\s+%s\s+(.*)" % define)
+ regex = re.compile(r"^#\s*define\s+%s\s+(.*)" % define)
with open(filename, "r") as file:
for l in file:
match = regex.match(l)
diff --git a/build_files/buildbot/codesign/archive_with_indicator.py b/build_files/buildbot/codesign/archive_with_indicator.py
index 085026fcf98..e5c4be885bc 100644
--- a/build_files/buildbot/codesign/archive_with_indicator.py
+++ b/build_files/buildbot/codesign/archive_with_indicator.py
@@ -102,7 +102,7 @@ class ArchiveWithIndicator:
# Wait for until archive is fully stored.
actual_archive_size = self.archive_filepath.stat().st_size
- if actual_archive_size != expected_archive_size:
+ if actual_archive_size != expected_archive_size:
print('Partial/invalid archive size (expected '
f'{expected_archive_size} got {actual_archive_size})')
return False
diff --git a/build_files/buildbot/worker_pack.py b/build_files/buildbot/worker_pack.py
index 82b406cd42d..a5727a66e09 100644
--- a/build_files/buildbot/worker_pack.py
+++ b/build_files/buildbot/worker_pack.py
@@ -35,7 +35,7 @@ def get_package_name(builder, platform=None):
package_name = 'blender-' + info.full_version
if platform:
- package_name += '-' + platform
+ package_name += '-' + platform
if not (builder.branch == 'master' or builder.is_release_branch):
if info.is_development_build:
package_name = builder.branch + "-" + package_name
@@ -175,7 +175,11 @@ def pack_linux(builder):
print("Stripping python...")
py_target = os.path.join(builder.install_dir, info.short_version)
- buildbot_utils.call(builder.command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
+ buildbot_utils.call(
+ builder.command_prefix + [
+ 'find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';',
+ ],
+ )
# Construct package name
platform_name = 'linux64'
diff --git a/build_files/buildbot/worker_test.py b/build_files/buildbot/worker_test.py
index db02801007e..8a6e7d4bb69 100644
--- a/build_files/buildbot/worker_test.py
+++ b/build_files/buildbot/worker_test.py
@@ -33,7 +33,7 @@ def get_ctest_arguments(builder):
def test(builder):
os.chdir(builder.build_dir)
- command = builder.command_prefix + ['ctest'] + get_ctest_arguments(builder)
+ command = builder.command_prefix + ['ctest'] + get_ctest_arguments(builder)
buildbot_utils.call(command)