From 1fcb4297bda441b022071ae9bf2c25ba6c15a51b Mon Sep 17 00:00:00 2001 From: Adam Groszer Date: Thu, 6 Sep 2012 10:14:19 +0000 Subject: [PATCH] added some python 3.2 builders, changed zc.buildout mail targets --- master.cfg | 71 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/master.cfg b/master.cfg index d9a7cb8..7051a46 100644 --- a/master.cfg +++ b/master.cfg @@ -356,71 +356,97 @@ class Platform(object): self.majorVersion = self.title[7:10] PLATFORMS = dict( - py_244_win32 = Platform( + py_244_win32=Platform( name='py_244_win32', title='Python 2.4.4 win32', python=r'c:\Python24_32\python.exe', withcompiler=r'cmd /c c:\Python24_32\setupcompilerandexecute.bat %s'), - py_254_win32 = Platform( + py_254_win32=Platform( name='py_254_win32', title='Python 2.5.4 win32', python=r'c:\Python25_32\python.exe', withcompiler=r'cmd /c c:\Python25_32\setupcompilerandexecute.bat %s'), - py_265_win32 = Platform( + py_265_win32=Platform( name='py_265_win32', title='Python 2.6.5 win32', python=r'c:\Python26_32\python.exe', withcompiler=r'cmd /c c:\Python26_32\setupcompilerandexecute.bat %s'), - py_265_win64 = Platform( + py_265_win64=Platform( name='py_265_win64', title='Python 2.6.5 win64', python=r'c:\Python26_64\python.exe', withcompiler=r'cmd /c c:\Python26_64\setupcompilerandexecute.bat %s'), - py_270_win32 = Platform( + py_270_win32=Platform( name='py_270_win32', title='Python 2.7.0 win32', python=r'c:\Python27_32\python.exe', withcompiler=r'cmd /c c:\Python27_32\setupcompilerandexecute.bat %s'), - py_270_win64 = Platform( + py_270_win64=Platform( name='py_270_win64', title='Python 2.7.0 win64', python=r'c:\Python27_64\python.exe', withcompiler=r'cmd /c c:\Python27_64\setupcompilerandexecute.bat %s'), ) +PLATFORMS_3 = dict( + py_323_win32=Platform( + name='py_323_win32', + title='Python 3.2.3 win32', + python=r'c:\Python32_32\python.exe', + withcompiler=r'cmd /c c:\Python32_32\setupcompilerandexecute.bat %s'), + py_323_win64=Platform( + name='py_323_win64', + title='Python 3.2.3 win64', + python=r'c:\Python32_64\python.exe', + withcompiler=r'cmd /c c:\Python32_64\setupcompilerandexecute.bat %s'), +) + CLEAN_PLATFORMS = dict( - py_244_win32 = Platform( + py_244_win32=Platform( name='py_244_win32', title='Python 2.4.4 win32', python=r'c:\Python24_32_clean\python.exe', withcompiler=r'cmd /c c:\Python24_32_clean\setupcompilerandexecute.bat %s'), - py_254_win32 = Platform( + py_254_win32=Platform( name='py_254_win32', title='Python 2.5.4 win32', python=r'c:\Python25_32_clean\python.exe', withcompiler=r'cmd /c c:\Python25_32_clean\setupcompilerandexecute.bat %s'), - py_265_win32 = Platform( + py_265_win32=Platform( name='py_265_win32', title='Python 2.6.5 win32', python=r'c:\Python26_32_clean\python.exe', withcompiler=r'cmd /c c:\Python26_32_clean\setupcompilerandexecute.bat %s'), - py_265_win64 = Platform( + py_265_win64=Platform( name='py_265_win64', title='Python 2.6.5 win64', python=r'c:\Python26_64_clean\python.exe', withcompiler=r'cmd /c c:\Python26_64_clean\setupcompilerandexecute.bat %s'), - py_270_win32 = Platform( + py_270_win32=Platform( name='py_270_win32', title='Python 2.7.0 win32', python=r'c:\Python27_32_clean\python.exe', withcompiler=r'cmd /c c:\Python27_32_clean\setupcompilerandexecute.bat %s'), - py_270_win64 = Platform( + py_270_win64=Platform( name='py_270_win64', title='Python 2.7.0 win64', python=r'c:\Python27_64_clean\python.exe', withcompiler=r'cmd /c c:\Python27_64_clean\setupcompilerandexecute.bat %s'), ) +CLEAN_PLATFORMS_3 = dict( + py_323_win32=Platform( + name='py_323_win32', + title='Python 3.2.3 win32', + python=r'c:\Python32_32_clean\python.exe', + withcompiler=r'cmd /c c:\Python32_32_clean\setupcompilerandexecute.bat %s'), + py_323_win64=Platform( + name='py_323_win64', + title='Python 3.2.3 win64', + python=r'c:\Python32_64_clean\python.exe', + withcompiler=r'cmd /c c:\Python32_64_clean\setupcompilerandexecute.bat %s'), +) + # platform definitions ###################################### @@ -436,6 +462,7 @@ del ZTK_DEV_PLATFORMS['py_265_win64'] del ZTK_DEV_PLATFORMS['py_270_win32'] del ZTK_DEV_PLATFORMS['py_270_win64'] + def ztk_dev_builder(name, slavename, platform, locks): builddir = name.replace(' ', '_') f = factory.BuildFactory() @@ -492,6 +519,7 @@ def ztk_dev_builder(name, slavename, platform, locks): factory=f, locks=locks) + def setupZTK_dev_tests(slow_lock, hour=02, minute=01): #hour = 02 #minute = 01 @@ -688,6 +716,7 @@ def setupZTK_11_tests(slow_lock, hour=02, minute=10): ZC_BUILDOUT_PLATFORMS = CLEAN_PLATFORMS.copy() del ZC_BUILDOUT_PLATFORMS['py_244_win32'] del ZC_BUILDOUT_PLATFORMS['py_254_win32'] +ZC_BUILDOUT_PLATFORMS.update(CLEAN_PLATFORMS_3) ZC_BUILDOUT_PLATFORMS_16 = CLEAN_PLATFORMS.copy() del ZC_BUILDOUT_PLATFORMS_16['py_244_win32'] @@ -755,14 +784,23 @@ def setup_zc_buildout_dev_tests(slow_lock, hour=02, minute=20, branch='HEAD', minute += 1 c['status'].append( - MailNotifier(mode="all", + MailNotifier(mode="failing", fromaddr=FROMADDR, - extraRecipients=["zope-tests@zope.org"], + extraRecipients=["jim@zope.com", "agroszer@gmail.com"], sendToInterestedUsers=False, builders=builders, messageFormatter=message_formatter) ) + #c['status'].append( + # MailNotifier(mode="all", + # fromaddr=FROMADDR, + # extraRecipients=["zope-tests@zope.org"], + # sendToInterestedUsers=False, + # builders=builders, + # messageFormatter=message_formatter) + # ) + # zc.buildout ###################################### @@ -771,6 +809,7 @@ def setup_zc_buildout_dev_tests(slow_lock, hour=02, minute=20, branch='HEAD', # distribute DISTRIBUTE_PLATFORMS = CLEAN_PLATFORMS.copy() +DISTRIBUTE_PLATFORMS.update(CLEAN_PLATFORMS_3) def distribute_dev_builder(name, slavename, platform, locks): @@ -826,7 +865,7 @@ def setup_distribute_dev_tests(slow_lock, hour=02, minute=20, ) -# zc.buildout +# distribute ###################################### ###################################### @@ -908,6 +947,7 @@ if 'py_244_win32' in ZODB_DEV_PLATFORMS: if 'py_254_win32' in ZODB_DEV_PLATFORMS: del ZODB_DEV_PLATFORMS['py_254_win32'] + def ZODB_dev_builder(name, slavename, platform, locks): builddir = name.replace(' ', '_') f = factory.BuildFactory() @@ -949,6 +989,7 @@ def ZODB_dev_builder(name, slavename, platform, locks): factory=f, locks=locks) + def setup_ZODB_dev_tests(slow_lock, hour=02, minute=40): #hour = 02 #minute = 40