Twisted Buildbot Configuration

Merge lp:~therve/twisted-buildbot-configuration/remove-py2.5 into lp:~exarkun/twisted-buildbot-configuration/trunk

  1. remove-py2.5
  2. Merge into trunk
Proposed by Thomas Herve
Status: Merged
Merged at revision: 272
Proposed branch: lp:~therve/twisted-buildbot-configuration/remove-py2.5
Merge into: lp:~exarkun/twisted-buildbot-configuration/trunk
Diff against target: 161 lines (+8/-76)
1 file modified
master/master.cfg (+8/-76)
To merge this branch: bzr merge lp:~therve/twisted-buildbot-configuration/remove-py2.5
Reviewer Review Type Date Requested Status
Jean-Paul Calderone Pending
Review via email: mp+108724@code.launchpad.net

Description of the change

After 12.1 release, this removes the builders using 2.5. I changed some of them to use 2.6, hoping it's present, and removed others.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'master/master.cfg'
2--- master/master.cfg 2012-03-29 16:40:09 +0000
3+++ master/master.cfg 2012-06-05 12:13:25 +0000
4@@ -44,7 +44,7 @@
5 LinuxPyOpenSSLBuildFactory,
6 OSXPyOpenSSLBuildFactory, Win32PyOpenSSLBuildFactory,
7 TwistedEasyInstallFactory, TwistedPyPyBuildFactory,
8- PyPyTranslationFactory, TwistedIronPythonBuildFactory,
9+ PyPyTranslationFactory,
10 TwistedScheduler, TwistedBdistMsiFactory,
11 PyOpenSSLGCoverageFactory, TwistedGCoverageFactory,
12 TwistedCoveragePyFactory, CPythonBuildFactory,
13@@ -154,17 +154,6 @@
14
15 builders = []
16
17-b23compile_opts = [
18- "-Wignore::PendingDeprecationWarning:distutils.command.build_py",
19- "-Wignore::PendingDeprecationWarning:distutils.command.build_ext",
20- ]
21-b24compile_opts = [
22- "-W", "ignore::PendingDeprecationWarning:distutils.command.build_py",
23- "-W", "ignore::PendingDeprecationWarning:distutils.command.build_ext",
24- ]
25-
26-b25compile_opts = b24compile_opts # FIXME
27-
28 oneCPULock = SlaveLock('cpu-1', maxCount=1)
29 twoCPULock = SlaveLock('cpu-2', maxCount=2)
30
31@@ -227,13 +216,13 @@
32 'category': 'unsupported'})
33
34 builders.append({
35- 'name': 'debian-easy-py2.5-epoll',
36+ 'name': 'debian-easy-py2.6-epoll',
37 'slavenames': ['bot-idnar-debian'],
38- 'builddir': 'easy2.5debian',
39+ 'builddir': 'easy2.6debian',
40 'factory': TwistedEasyInstallFactory(bzr_update,
41- python=["python2.5", "-Wall"],
42+ python=["python2.6", "-Wall"],
43 uncleanWarnings=False,
44- easy_install="easy_install-2.5"),
45+ easy_install="easy_install-2.6"),
46 'category': 'supported'})
47
48
49@@ -256,15 +245,6 @@
50
51
52 builders.append({
53- 'slavenames': ['bot-glyph-3'],
54- 'name': 'hardy32-py2.5-select',
55- 'builddir': 'hardy32-python2.5-select',
56- 'factory': FullTwistedBuildFactory(bzr_update,
57- python=["python2.5", "-Wall"]),
58- 'category': 'supported'})
59-
60-
61-builders.append({
62 'slavenames': ['bot-glyph-1'],
63 'name': 'lucid32-cpy2.7maint-translator',
64 'builddir': 'lucid32-python2.7maint-translator',
65@@ -303,7 +283,7 @@
66 del python26W3
67
68 builders.append({
69- 'slavenames': ['bot-glyph-3'],
70+ 'slavenames': ['bot-glyph-1'],
71 'name': 'py-select-gc',
72 'builddir': 'py-select-gc',
73 'factory': GoodTwistedBuildFactory(bzr_update,
74@@ -319,9 +299,9 @@
75 bot = bot_exarkun_1.copy()
76 bot.update({
77 'name': 'py-without-modules',
78- 'builddir': 'py2.5-without-modules',
79+ 'builddir': 'py2.6-without-modules',
80 'factory': GoodTwistedBuildFactory(
81- bzr_update, python="python", uncleanWarnings=False,
82+ bzr_update, python="python2.6", uncleanWarnings=False,
83 extraTrialArguments={
84 'trialArgs': [
85 '--without-module', 'OpenSSL',
86@@ -345,18 +325,6 @@
87 'slavenames': ['bot-scmikes-winxp32-3'],
88 }
89
90-builders.append({
91- 'slavenames': ['bot-glyph-5'],
92- 'name': "winxp32-py2.5",
93- 'builddir': "winxp32-py2.5-select",
94- 'factory': TwistedReactorsBuildFactory(bzr_update,
95- RemovePYCs=Win32RemovePYCs,
96- python="c:\\python25\\python.exe",
97- reactors=["select", "iocp"],
98- uncleanWarnings=True),
99- 'locks': [baelnornSerializationLock.access("exclusive")],
100- 'category': 'supported'})
101-
102
103 builders.append({
104 'slavenames': ['tomprince-socrates-winxp-1'],
105@@ -384,20 +352,6 @@
106 'category': 'supported'})
107
108
109-winxp32py25gtk2 = winxp1.copy()
110-winxp32py25gtk2.update({
111- 'name': 'winxp32-py2.5-gtk2',
112- 'builddir': 'winxp32-py2.5-gtk2',
113- 'factory': TwistedReactorsBuildFactory(bzr_update,
114- RemovePYCs=Win32RemovePYCs,
115- python="c:\\python25\\python.exe",
116- compileOpts2=["-c","mingw32"],
117- reactors=["gtk2"],
118- uncleanWarnings=True),
119- 'category': 'unsupported'})
120-builders.append(winxp32py25gtk2)
121-
122-
123 builders.append({
124 'name': 'windows7-32-py2.7',
125 'builddir': 'windows7-64-py2.7',
126@@ -424,17 +378,6 @@
127
128
129 builders.append({
130- 'name': "winxp32-py2.5-msi",
131- 'slavenames': ['bot-glyph-5'],
132- 'builddir': "winxp32-py2.5-msi",
133- 'factory': TwistedBdistMsiFactory(bzr_update,
134- uncleanWarnings=True,
135- arch="win32",
136- pyVersion="2.5"),
137- 'locks': [baelnornSerializationLock.access("exclusive")],
138- 'category': 'supported'})
139-
140-builders.append({
141 'name': "winxp32-py2.6-msi",
142 'slavenames': ['tomprince-socrates-winxp-1'],
143 'builddir': "winxp32-py2.6-msi",
144@@ -487,17 +430,6 @@
145
146
147 builders.append({
148- 'name': 'fedora32-py2.5-reactors',
149- 'slavenames': ['bot-thread'],
150- 'builddir': 'fedora32-py2.5-reactors',
151- 'factory': TwistedReactorsBuildFactory(source_copy,
152- python="python",
153- reactors=["poll", "epoll", "glib2"],
154- uncleanWarnings=True),
155- 'category': 'supported'})
156-
157-
158-builders.append({
159 'name': 'lucid64-py2.6-wx',
160 'slavenames': ['bot-glyph-1'],
161 'builddir': 'ubuntu-py2.6-wx',

Subscribers

People subscribed via source and target branches