diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-29 07:35:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-29 07:35:06 +0300 |
commit | 7095f4766593cc2b55669b032d7de0fa13fcb4c7 (patch) | |
tree | 3567f182b513225a1b522b75e144eb5b75d1b6e2 /build_files | |
parent | d434815ff7c586f6e54af667e37c9d2d12726416 (diff) |
cleanup: pep8
also remove empty class parenthesis
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/master.cfg | 7 | ||||
-rw-r--r-- | build_files/buildbot/master_unpack.py | 4 | ||||
-rw-r--r-- | build_files/buildbot/slave_compile.py | 4 | ||||
-rw-r--r-- | build_files/buildbot/slave_pack.py | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index e96f49bdb5f..d7f56781f38 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -4,10 +4,10 @@ # <pep8 compliant> # List of the branches being built automatically overnight -NIGHT_SCHEDULE_BRANCHES=[None, "gooseberry"] +NIGHT_SCHEDULE_BRANCHES = [None, "gooseberry"] # List of the branches available for force build -FORCE_SCHEDULE_BRANCHES=["master", "gooseberry", "experimental-build"] +FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"] """ Stock Twisted directory lister doesn't provide any information about last file @@ -17,6 +17,7 @@ modification time, we hack the class a bit in order to have such functionaliity from buildbot.status.web.base import DirectoryLister + def get_files_and_directories(self, directory): from twisted.web.static import (getTypeAndEncoding, formatFileSize) @@ -97,6 +98,7 @@ all_repositories = { r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn', } + def codebaseGenerator(chdict): return all_repositories[chdict['repository']] @@ -112,6 +114,7 @@ from buildbot.schedulers import timed, forcesched c['schedulers'] = [] + def schedule_force_build(name): c['schedulers'].append(forcesched.ForceScheduler(name='force ' + name, builderNames=[name], diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py index 56ab80dc87f..46131c5e1de 100644 --- a/build_files/buildbot/master_unpack.py +++ b/build_files/buildbot/master_unpack.py @@ -37,6 +37,7 @@ def strip_extension(filename): return filename + # extract platform from package name def get_platform(filename): # name is blender-version-platform.extension. we want to get the @@ -64,10 +65,11 @@ def get_platform(filename): return '-'.join(platform_tokens) + def get_branch(filename): tokens = filename.split("-") branch = "" - + for token in tokens: if token == "blender": return branch diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 4ef46331c64..cbe345e764c 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -47,9 +47,9 @@ if 'cmake' in builder: cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc') if 'win64' in builder: - cmake_options.append(['-G','"Visual Studio 12 2013 Win64"']) + cmake_options.append(['-G', '"Visual Studio 12 2013 Win64"']) elif 'win32' in builder: - cmake_options.append(['-G','"Visual Studio 12 2013"']) + cmake_options.append(['-G', '"Visual Studio 12 2013"']) cmake_options.append("-C../blender.git/build_files/cmake/config/blender_full.cmake") cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=1") diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 8959e0e06f9..4e5d77b2a0a 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -116,12 +116,12 @@ if builder.find('scons') != -1: retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options) sys.exit(retcode) else: -#cmake + # CMake if 'win' in builder: files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')] for f in files: os.remove(f) - retcode = subprocess.call(['cpack', '-G','ZIP']) + retcode = subprocess.call(['cpack', '-G', 'ZIP']) result_file = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')][0] os.rename(result_file, "{}.zip".format(builder)) # create zip file |