1
=== modified file 'Makefile'
2
--- Makefile	2011-10-13 20:18:51 +0000
3
+++ Makefile	2011-12-08 05:30:29 +0000
4
@@ -11,8 +11,8 @@
5
11
	CREATE_DOWNLOAD_CACHE_COMMAND=ln -s $(LAZR_SOURCEDEPS_DIR)/download-cache
11
	CREATE_DOWNLOAD_CACHE_COMMAND=ln -s $(LAZR_SOURCEDEPS_DIR)/download-cache
6
12
else
12
else
7
13
	CREATE_EGGS_COMMAND=mkdir eggs
13
	CREATE_EGGS_COMMAND=mkdir eggs
10
14
	CREATE_DOWNLOAD_CACHE_COMMAND=bzr checkout \
14
	CREATE_DOWNLOAD_CACHE_COMMAND=bzr checkout --lightweight \
11
15
    lp:lazr-source-dependencies download-cache
15
    lp:lp-source-dependencies download-cache
12
16
endif
16
endif
13
17
17
14
18
.PHONY: test build lint check clean tags run dbreset harness
18
.PHONY: test build lint check clean tags run dbreset harness
15
@@ -22,7 +22,7 @@
16
22
bin/buildout: buildout.cfg versions.cfg setup.py download-cache eggs
22
bin/buildout: buildout.cfg versions.cfg setup.py download-cache eggs
17
23
	bzr up download-cache
23
	bzr up download-cache
18
24
	$(PYTHON) bootstrap.py \
24
	$(PYTHON) bootstrap.py \
20
25
		--setup-source=ez_setup.py \
25
		--setup-source=download-cache/ez_setup.py \
21
26
		--download-base=download-cache/dist --eggs=eggs
26
		--download-base=download-cache/dist --eggs=eggs
22
27
	bin/buildout configuration:db-port=$(DBPORT)
27
	bin/buildout configuration:db-port=$(DBPORT)
23
28
	@touch bin/buildout
28
	@touch bin/buildout
24
29
29
25
=== modified file '_bootstrap/bootstrap.py' (properties changed: -x to +x)
26
--- _bootstrap/bootstrap.py	2011-10-13 20:18:51 +0000
27
+++ _bootstrap/bootstrap.py	2011-12-08 05:30:29 +0000
28
@@ -1,3 +1,4 @@
29
1
#!/usr/bin/env python
30
1
##############################################################################
2
##############################################################################
31
2
#
3
#
32
3
# Copyright (c) 2006 Zope Foundation and Contributors.
4
# Copyright (c) 2006 Zope Foundation and Contributors.
33
4
5
34
=== removed file 'ez_setup.py'
35
--- ez_setup.py	2011-10-13 20:18:51 +0000
36
+++ ez_setup.py	1970-01-01 00:00:00 +0000
37
@@ -1,275 +0,0 @@
38
1
#!python
39
2
"""Bootstrap setuptools installation
40
3
41
4
If you want to use setuptools in your package's setup.py, just include this
42
5
file in the same directory with it, and add this to the top of your setup.py::
43
6
44
7
    from ez_setup import use_setuptools
45
8
    use_setuptools()
46
9
47
10
If you want to require a specific version of setuptools, set a download
48
11
mirror, or use an alternate download directory, you can do so by supplying
49
12
the appropriate options to ``use_setuptools()``.
50
13
51
14
This file can also be run as a script to install or upgrade setuptools.
52
15
"""
53
16
import sys
54
17
DEFAULT_VERSION = "0.6c11"
55
18
DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
56
19
57
20
md5_data = {
58
21
    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
59
22
    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
60
23
    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
61
24
    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
62
25
    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
63
26
    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
64
27
    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
65
28
    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
66
29
    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
67
30
    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
68
31
    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
69
32
    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
70
33
    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
71
34
    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
72
35
    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
73
36
    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
74
37
    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
75
38
    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
76
39
    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
77
40
    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
78
41
    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
79
42
    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
80
43
    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
81
44
    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
82
45
    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
83
46
    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
84
47
    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
85
48
    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
86
49
    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
87
50
    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
88
51
    'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
89
52
    'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
90
53
    'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
91
54
    'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
92
55
}
93
56
94
57
import sys, os
95
58
try: from hashlib import md5
96
59
except ImportError: from md5 import md5
97
60
98
61
def _validate_md5(egg_name, data):
99
62
    if egg_name in md5_data:
100
63
        digest = md5(data).hexdigest()
101
64
        if digest != md5_data[egg_name]:
102
65
            print >>sys.stderr, (
103
66
                "md5 validation of %s failed!  (Possible download problem?)"
104
67
                % egg_name
105
68
            )
106
69
            sys.exit(2)
107
70
    return data
108
71
109
72
def use_setuptools(
110
73
    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
111
74
    download_delay=15
112
75
):
113
76
    """Automatically find/download setuptools and make it available on sys.path
114
77
115
78
    `version` should be a valid setuptools version number that is available
116
79
    as an egg for download under the `download_base` URL (which should end with
117
80
    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
118
81
    it is not already available.  If `download_delay` is specified, it should
119
82
    be the number of seconds that will be paused before initiating a download,
120
83
    should one be required.  If an older version of setuptools is installed,
121
84
    this routine will print a message to ``sys.stderr`` and raise SystemExit in
122
85
    an attempt to abort the calling script.
123
86
    """
124
87
    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
125
88
    def do_download():
126
89
        egg = download_setuptools(version, download_base, to_dir, download_delay)
127
90
        sys.path.insert(0, egg)
128
91
        import setuptools; setuptools.bootstrap_install_from = egg
129
92
    try:
130
93
        import pkg_resources
131
94
    except ImportError:
132
95
        return do_download()       
133
96
    try:
134
97
        pkg_resources.require("setuptools>="+version); return
135
98
    except pkg_resources.VersionConflict, e:
136
99
        if was_imported:
137
100
            print >>sys.stderr, (
138
101
            "The required version of setuptools (>=%s) is not available, and\n"
139
102
            "can't be installed while this script is running. Please install\n"
140
103
            " a more recent version first, using 'easy_install -U setuptools'."
141
104
            "\n\n(Currently using %r)"
142
105
            ) % (version, e.args[0])
143
106
            sys.exit(2)
144
107
        else:
145
108
            del pkg_resources, sys.modules['pkg_resources']    # reload ok
146
109
            return do_download()
147
110
    except pkg_resources.DistributionNotFound:
148
111
        return do_download()
149
112
150
113
def download_setuptools(
151
114
    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
152
115
    delay = 15
153
116
):
154
117
    """Download setuptools from a specified location and return its filename
155
118
156
119
    `version` should be a valid setuptools version number that is available
157
120
    as an egg for download under the `download_base` URL (which should end
158
121
    with a '/'). `to_dir` is the directory where the egg will be downloaded.
159
122
    `delay` is the number of seconds to pause before an actual download attempt.
160
123
    """
161
124
    import urllib2, shutil
162
125
    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
163
126
    url = download_base + egg_name
164
127
    saveto = os.path.join(to_dir, egg_name)
165
128
    src = dst = None
166
129
    if not os.path.exists(saveto):  # Avoid repeated downloads
167
130
        try:
168
131
            from distutils import log
169
132
            if delay:
170
133
                log.warn("""
171
134
---------------------------------------------------------------------------
172
135
This script requires setuptools version %s to run (even to display
173
136
help).  I will attempt to download it for you (from
174
137
%s), but
175
138
you may need to enable firewall access for this script first.
176
139
I will start the download in %d seconds.
177
140
178
141
(Note: if this machine does not have network access, please obtain the file
179
142
180
143
   %s
181
144
182
145
and place it in this directory before rerunning this script.)
183
146
---------------------------------------------------------------------------""",
184
147
                    version, download_base, delay, url
185
148
                ); from time import sleep; sleep(delay)
186
149
            log.warn("Downloading %s", url)
187
150
            src = urllib2.urlopen(url)
188
151
            # Read/write all in one block, so we don't create a corrupt file
189
152
            # if the download is interrupted.
190
153
            data = _validate_md5(egg_name, src.read())
191
154
            dst = open(saveto,"wb"); dst.write(data)
192
155
        finally:
193
156
            if src: src.close()
194
157
            if dst: dst.close()
195
158
    return os.path.realpath(saveto)
196
159
197
160
198
161
199
162
200
163
201
164
202
165
203
166
204
167
205
168
206
169
207
170
208
171
209
172
210
173
211
174
212
175
213
176
214
177
215
178
216
179
217
180
218
181
219
182
220
183
221
184
222
185
223
186
224
187
225
188
226
189
227
190
228
191
229
192
230
193
231
194
232
195
def main(argv, version=DEFAULT_VERSION):
233
196
    """Install or upgrade setuptools and EasyInstall"""
234
197
    try:
235
198
        import setuptools
236
199
    except ImportError:
237
200
        egg = None
238
201
        try:
239
202
            egg = download_setuptools(version, delay=0)
240
203
            sys.path.insert(0,egg)
241
204
            from setuptools.command.easy_install import main
242
205
            return main(list(argv)+[egg])   # we're done here
243
206
        finally:
244
207
            if egg and os.path.exists(egg):
245
208
                os.unlink(egg)
246
209
    else:
247
210
        if setuptools.__version__ == '0.0.1':
248
211
            print >>sys.stderr, (
249
212
            "You have an obsolete version of setuptools installed.  Please\n"
250
213
            "remove it from your system entirely before rerunning this script."
251
214
            )
252
215
            sys.exit(2)
253
216
254
217
    req = "setuptools>="+version
255
218
    import pkg_resources
256
219
    try:
257
220
        pkg_resources.require(req)
258
221
    except pkg_resources.VersionConflict:
259
222
        try:
260
223
            from setuptools.command.easy_install import main
261
224
        except ImportError:
262
225
            from easy_install import main
263
226
        main(list(argv)+[download_setuptools(delay=0)])
264
227
        sys.exit(0) # try to force an exit
265
228
    else:
266
229
        if argv:
267
230
            from setuptools.command.easy_install import main
268
231
            main(argv)
269
232
        else:
270
233
            print "Setuptools version",version,"or greater has been installed."
271
234
            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
272
235
273
236
def update_md5(filenames):
274
237
    """Update our built-in md5 registry"""
275
238
276
239
    import re
277
240
278
241
    for name in filenames:
279
242
        base = os.path.basename(name)
280
243
        f = open(name,'rb')
281
244
        md5_data[base] = md5(f.read()).hexdigest()
282
245
        f.close()
283
246
284
247
    data = ["    %r: %r,\n" % it for it in md5_data.items()]
285
248
    data.sort()
286
249
    repl = "".join(data)
287
250
288
251
    import inspect
289
252
    srcfile = inspect.getsourcefile(sys.modules[__name__])
290
253
    f = open(srcfile, 'rb'); src = f.read(); f.close()
291
254
292
255
    match = re.search("\nmd5_data = {\n([^}]+)}", src)
293
256
    if not match:
294
257
        print >>sys.stderr, "Internal error!"
295
258
        sys.exit(2)
296
259
297
260
    src = src[:match.start(1)] + repl + src[match.end(1):]
298
261
    f = open(srcfile,'w')
299
262
    f.write(src)
300
263
    f.close()
301
264
302
265
303
266
if __name__=='__main__':
304
267
    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
305
268
        update_md5(sys.argv[2:])
306
269
    else:
307
270
        main(sys.argv[1:])
308
271
309
272
310
273
311
274
312
275
313
276
0
314
=== modified file 'setup.py'
315
--- setup.py	2011-11-30 17:06:23 +0000
316
+++ setup.py	2011-12-08 05:30:29 +0000
317
@@ -15,9 +15,6 @@
318
15
# You should have received a copy of the GNU Affero General Public License
15
# You should have received a copy of the GNU Affero General Public License
319
16
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
320
17
17
321
18
import ez_setup
322
19
ez_setup.use_setuptools()
323
20
324
21
import sys
18
import sys
325
22
from setuptools import setup, find_packages
19
from setuptools import setup, find_packages
326
23
20
327
24
21
328
=== modified file 'src/oopstools/NEWS.txt'
329
--- src/oopstools/NEWS.txt	2011-11-21 04:50:37 +0000
330
+++ src/oopstools/NEWS.txt	2011-12-08 05:30:29 +0000
331
@@ -25,6 +25,9 @@
332
25
* Mixed case OOPS reports can now be looked up in the web UI without their
25
* Mixed case OOPS reports can now be looked up in the web UI without their
333
26
  OOPS-prefix (if they had one). (Robert Collins, #884571)
26
  OOPS-prefix (if they had one). (Robert Collins, #884571)
334
27
27
335
28
* Now uses the lp source dependencies rather than lazr, as part of simplifying
336
29
  the maintenance of the many related LP projects. (Robert Collins)
337
30
338
28
* Old OOPS reports can be cleaned out using the new script bin/prune.
31
* Old OOPS reports can be cleaned out using the new script bin/prune.
339
29
  (Robert Collins)
32
  (Robert Collins)
340
30
33
341
31
34
342
=== modified file 'versions.cfg'
343
--- versions.cfg	2011-11-30 17:06:23 +0000
344
+++ versions.cfg	2011-12-08 05:30:29 +0000
345
@@ -2,38 +2,39 @@
346
2
versions = versions
2
versions = versions
347
3
3
348
4
[versions]
4
[versions]
350
5
BeautifulSoup = 3.0.7a
5
BeautifulSoup = 3.2.0
351
6
ClientForm = 0.2.10
6
ClientForm = 0.2.10
354
7
Jinja2 = 2.1.1
7
Jinja2 = 2.5.5
355
8
Pygments = 1.0
8
Pygments = 1.4
356
9
# XXX 20011-06-15 matsubara: Using South trunk up to r929 because changeset:
9
# XXX 20011-06-15 matsubara: Using South trunk up to r929 because changeset:
357
10
# http://south.aeracode.org/changeset/21a63523132712eead38df6f3e43f7e616c114be
10
# http://south.aeracode.org/changeset/21a63523132712eead38df6f3e43f7e616c114be
358
11
# is necessary due to a Django 1.3 incompatibility. Once 0.7.4 is released,
11
# is necessary due to a Django 1.3 incompatibility. Once 0.7.4 is released,
359
12
# this can be changed and package in the download-cache can be deleted.
12
# this can be changed and package in the download-cache can be deleted.
360
13
South = 0.7.3-r929
13
South = 0.7.3-r929
362
14
Sphinx = 0.6.2
14
Sphinx = 1.0.7
363
15
sqlparse = 0.1.2
15
sqlparse = 0.1.2
364
16
djangorecipe = 0.19.2
16
djangorecipe = 0.19.2
365
17
distribute = 0.6.12
17
distribute = 0.6.12
366
18
docutils = 0.6
18
docutils = 0.6
368
19
launchpadlib = 1.6.0
19
launchpadlib = 1.9.11
369
20
lazr.config = 1.1.3
20
lazr.config = 1.1.3
370
21
mechanize = 0.1.11
21
mechanize = 0.1.11
371
22
oops = 0.0.10
22
oops = 0.0.10
372
23
oops-amqp = 0.0.4
23
oops-amqp = 0.0.4
374
24
oops-datedir-repo = 0.0.14
24
oops-datedir-repo = 0.0.15
375
25
# XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is
25
# XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is
376
26
# incompatible with Django 1.3, but 2.4.1 works fine.
26
# incompatible with Django 1.3, but 2.4.1 works fine.
377
27
psycopg2 = 2.4.1
27
psycopg2 = 2.4.1
378
28
setuptools = 0.6c11
28
setuptools = 0.6c11
380
29
z3c.recipe.filetemplate = 2.0.3
29
testtools = 0.9.12
381
30
z3c.recipe.filetemplate = 2.1.0
382
30
z3c.recipe.sphinxdoc = 0.0.8
31
z3c.recipe.sphinxdoc = 0.0.8
386
31
z3c.recipe.tag = 0.2.0
32
z3c.recipe.tag = 0.4.0
387
32
zc.buildout = 1.4.1
33
zc.buildout = 1.5.2
388
33
zc.recipe.egg = 1.2.2
34
zc.recipe.egg = 1.3.2
389
34
zope.cachedescriptors = 3.5.0
35
zope.cachedescriptors = 3.5.0
390
35
zope.event = 3.4.1
36
zope.event = 3.4.1
393
36
zope.i18nmessageid = 3.4.3
37
zope.i18nmessageid = 3.5.0
394
37
zope.interface = 3.5.1
38
zope.interface = 3.8.0
395
38
zope.schema = 3.5.4
39
zope.schema = 3.5.4
397
39
zope.testbrowser = 3.5.1
40
zope.testbrowser = 3.8.0
Status:	Merged
Approved by:	Robert Collins on 2011-12-08
Approved revision:	no longer in the source branch.
Merged at revision:	25
Proposed branch:	lp:~lifeless/python-oops-tools/deps
Merge into:	lp:python-oops-tools
Diff against target:	397 lines (+21/-294) 6 files modified Makefile (+3/-3) _bootstrap/bootstrap.py (+1/-0) ez_setup.py (+0/-275) setup.py (+0/-3) src/oopstools/NEWS.txt (+3/-0) versions.cfg (+14/-13)
To merge this branch:	bzr merge lp:~lifeless/python-oops-tools/deps
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Robert Collins (community)			Approve on 2011-12-08
Review via email: mp+84883@code.launchpad.net