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>2011-03-27 09:23:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-03-27 09:23:14 +0400
commit50a06eccff48a2029fa085dc8459246ff8c6394e (patch)
tree8c7d733b9358317b425833e8a3497dd200446504 /build_files
parent7ccfec1ff3ea0ee0ebdbdb91e3e44ab03ab81d6f (diff)
pep8 cleanup
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/master.cfg37
-rw-r--r--build_files/buildbot/master_unpack.py2
-rw-r--r--build_files/buildbot/slave_compile.py3
-rw-r--r--build_files/buildbot/slave_pack.py3
-rw-r--r--build_files/buildbot/slave_test.py4
-rw-r--r--build_files/cmake/cmake_qtcreator_project.py1
-rwxr-xr-xbuild_files/package_spec/build_archive.py2
7 files changed, 31 insertions, 21 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index f6aa6390e8c..6913ed2dab0 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -1,6 +1,8 @@
# -*- python -*-
# ex: set syntax=python:
+# <pep8 compliant>
+
# Dictionary that the buildmaster pays attention to.
c = BuildmasterConfig = {}
@@ -36,12 +38,12 @@ c['change_source'] = SVNPoller(
# only take place on one slave.
from buildbot.process.factory import BuildFactory
-from buildbot.steps.source import SVN
+from buildbot.steps.source import SVN
from buildbot.steps.shell import ShellCommand
from buildbot.steps.shell import Compile
from buildbot.steps.shell import Test
from buildbot.steps.transfer import FileUpload
-from buildbot.steps.transfer import FileDownload
+# from buildbot.steps.transfer import FileDownload
from buildbot.steps.master import MasterShellCommand
from buildbot.config import BuilderConfig
@@ -50,6 +52,7 @@ from buildbot.config import BuilderConfig
c['builders'] = []
buildernames = []
+
def add_builder(c, name, libdir, factory):
slavenames = []
@@ -64,15 +67,18 @@ def add_builder(c, name, libdir, factory):
# common steps
+
def svn_step():
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
+
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
# generic builder
-def generic_builder(id, libdir=''):
+
+def generic_builder(id, libdir=""):
filename = 'buildbot_upload_' + id + '.zip'
compile_script = '../blender/build_files/buildbot/slave_compile.py'
test_script = '../blender/build_files/buildbot/slave_test.py'
@@ -88,9 +94,9 @@ def generic_builder(id, libdir=''):
f.addStep(Test(command=['python', test_script, id]))
f.addStep(ShellCommand(name='package', command=['python', pack_script, id], description='packaging', descriptionDone='packaged'))
if id.find('cmake') != -1:
- f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100*1024*1024))
+ f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
else:
- f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100*1024*1024, workdir='install'))
+ f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
return f
@@ -107,7 +113,7 @@ add_builder(c, 'win32_scons', 'windows', generic_builder)
#
# Decide how to react to incoming changes.
-from buildbot.scheduler import Scheduler
+# from buildbot.scheduler import Scheduler
from buildbot.schedulers import timed
c['schedulers'] = []
@@ -132,18 +138,18 @@ c['schedulers'].append(timed.Nightly(name='nightly',
c['status'] = []
from buildbot.status import html
-from buildbot.status.web import auth, authz
+from buildbot.status.web import authz
-authz_cfg=authz.Authz(
+authz_cfg = authz.Authz(
# change any of these to True to enable; see the manual for more
# options
- gracefulShutdown = False,
- forceBuild = True, # use this to test your slave once it is set up
- forceAllBuilds = False,
- pingBuilder = False,
- stopBuild = False,
- stopAllBuilds = False,
- cancelPendingBuild = False,
+ gracefulShutdown=False,
+ forceBuild=True, # use this to test your slave once it is set up
+ forceAllBuilds=False,
+ pingBuilder=False,
+ stopBuild=False,
+ stopAllBuilds=False,
+ cancelPendingBuild=False,
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
@@ -168,4 +174,3 @@ c['buildbotURL'] = "http://builder.blender.org/"
# installations.
c['db_url'] = "sqlite:///state.sqlite"
-
diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index 5e0c6beb962..f97e53384b0 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -19,6 +19,8 @@
# Runs on Buildbot master, to unpack incoming unload.zip into latest
# builds directory and remove older builds.
+# <pep8 compliant>
+
import os
import shutil
import sys
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 708c2951272..54150a93e61 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
import os
import subprocess
import sys
@@ -56,4 +58,3 @@ else:
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
-
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 12171cf4003..74d00bf9249 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
# Runs on buildbot slave, creating a release package using the build
# system and zipping it into buildbot_upload.zip. This is then uploaded
# to the master in the next buildbot step.
@@ -83,4 +85,3 @@ try:
except Exception, ex:
sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
sys.exit(1)
-
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index 7e78f1ab5cd..f79ef7cf5c6 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -16,7 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
-import os
+# <pep8 compliant>
+
import subprocess
import sys
@@ -37,4 +38,3 @@ if builder.find('cmake') != -1:
else:
# scons
pass
-
diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py
index cf1da2f666f..1bad1835434 100644
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
@@ -126,7 +126,6 @@ def cmake_advanced_info():
defines = []
import os
- import sys
create_eclipse_project(CMAKE_DIR)
diff --git a/build_files/package_spec/build_archive.py b/build_files/package_spec/build_archive.py
index 2496c2295eb..0329d16b1ec 100755
--- a/build_files/package_spec/build_archive.py
+++ b/build_files/package_spec/build_archive.py
@@ -1,5 +1,7 @@
#!/usr/bin/python
+# <pep8 compliant>
+
import os
import shutil
import subprocess