Merge lp:~brian.curtin/ubuntuone-windows-installer/buildout-updates into lp:ubuntuone-windows-installer

Proposed by Brian Curtin
Status: Merged
Approved by: dobey
Approved revision: no longer in the source branch.
Merged at revision: 166
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/buildout-updates
Merge into: lp:ubuntuone-windows-installer
Diff against target: 155 lines (+34/-17)
3 files modified
scripts/devsetup/README.txt (+1/-1)
scripts/devsetup/bootstrap.py (+22/-7)
scripts/devsetup/buildout.cfg (+11/-9)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/buildout-updates
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
dobey (community) Approve
Review via email: mp+156212@code.launchpad.net

Commit message

- Bring buildout up to date with regards to missing dependencies.

Description of the change

Update several versions of dependencies used by buildout, including the buildout bootstrap script itself. Some dependencies are no longer available because they now return 404s, but I was able to rebuild and repackage them with newer versions and the tests pass normally (not 100% passing, but nothing new appears).

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) wrote :

Note that the change to bootstrap.py isn't my own work - it's our copy of Buildout's bootstrap script.

Revision history for this message
dobey (dobey) wrote :

99 http://u1.to/ralsina/G/protobuf-2.4.1-py2.7.egg#egg=protobuf
100 + http://u1.to/~brian.curtin/l/protobuf-2.5.0-py2.7.egg#egg=protobuf

I guess there's no reason to have both. Also, Ubuntu is still only at 2.4.1, so unless there's a good reason to use the newer one (security fix or major performance improvement), we should probably stick with 2.4.1.

review: Needs Fixing
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Mike McCracken (mikemc) wrote :

Works for me to get a working buildout on osx.
I ran the tests for sso-client and storage-protocol to check.

review: Approve
166. By Brian Curtin on 2013-04-03

- Bring buildout up to date with regards to missing dependencies.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/devsetup/README.txt'
2--- scripts/devsetup/README.txt 2012-04-17 21:00:48 +0000
3+++ scripts/devsetup/README.txt 2013-04-01 17:49:23 +0000
4@@ -13,7 +13,7 @@
5
6 1. Get python 2.7 32 bits, get PyQt, get pywin32.
7 2. Setup bazaar and your keys
8-3. python bootstrap.py
9+3. python bootstrap.py --distribute
10
11 If you are on Windows, run "bin\buildout install windows"
12 On other OSes, run "bin\buildout install development"
13
14=== modified file 'scripts/devsetup/bootstrap.py'
15--- scripts/devsetup/bootstrap.py 2012-03-27 22:09:13 +0000
16+++ scripts/devsetup/bootstrap.py 2013-04-01 17:49:23 +0000
17@@ -136,10 +136,6 @@
18
19 options, args = parser.parse_args()
20
21-# if -c was provided, we push it back into args for buildout's main function
22-if options.config_file is not None:
23- args += ['-c', options.config_file]
24-
25 if options.eggs:
26 eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
27 else:
28@@ -152,8 +148,7 @@
29 options.setup_source = setuptools_source
30
31 if options.accept_buildout_test_releases:
32- args.append('buildout:accept-buildout-test-releases=true')
33-args.append('bootstrap')
34+ args.insert(0, 'buildout:accept-buildout-test-releases=true')
35
36 try:
37 import pkg_resources
38@@ -170,6 +165,8 @@
39 setup_args['download_base'] = options.download_base
40 if options.use_distribute:
41 setup_args['no_fake'] = True
42+ if sys.version_info[:2] == (2, 4):
43+ setup_args['version'] = '0.6.32'
44 ez['use_setuptools'](**setup_args)
45 if 'pkg_resources' in sys.modules:
46 reload(sys.modules['pkg_resources'])
47@@ -192,6 +189,8 @@
48 find_links = options.download_base
49 if not find_links:
50 find_links = os.environ.get('bootstrap-testing-find-links')
51+if not find_links and options.accept_buildout_test_releases:
52+ find_links = 'http://downloads.buildout.org/'
53 if find_links:
54 cmd.extend(['-f', quote(find_links)])
55
56@@ -228,6 +227,8 @@
57 bestv = None
58 for dist in index[req.project_name]:
59 distv = dist.parsed_version
60+ if distv >= pkg_resources.parse_version('2dev'):
61+ continue
62 if _final_version(distv):
63 if bestv is None or distv > bestv:
64 best = [dist]
65@@ -237,8 +238,12 @@
66 if best:
67 best.sort()
68 version = best[-1].version
69+
70 if version:
71- requirement = '=='.join((requirement, version))
72+ requirement += '=='+version
73+else:
74+ requirement += '<2dev'
75+
76 cmd.append(requirement)
77
78 if is_jython:
79@@ -257,6 +262,16 @@
80 ws.add_entry(eggs_dir)
81 ws.require(requirement)
82 import zc.buildout.buildout
83+
84+# If there isn't already a command in the args, add bootstrap
85+if not [a for a in args if '=' not in a]:
86+ args.append('bootstrap')
87+
88+
89+# if -c was provided, we push it back into args for buildout's main function
90+if options.config_file is not None:
91+ args[0:0] = ['-c', options.config_file]
92+
93 zc.buildout.buildout.main(args)
94 if not options.eggs: # clean up temporary egg directory
95 shutil.rmtree(eggs_dir)
96
97=== modified file 'scripts/devsetup/buildout.cfg'
98--- scripts/devsetup/buildout.cfg 2013-02-12 20:53:04 +0000
99+++ scripts/devsetup/buildout.cfg 2013-04-01 17:49:23 +0000
100@@ -27,18 +27,20 @@
101 https://github.com/ghtdak/qtreactor/tarball/master#egg=qt4reactor
102 http://launchpad.net/python-distutils-extra/trunk/2.31/+download/python-distutils-extra-2.31.tar.gz#egg=python-distutils-extra
103 # Mandel's patched keyring, already built
104- http://u1.to/ralsina/L/keyring-0.7-py2.7.egg#egg=keyring
105+ http://u1.to/~brian.curtin/X/keyring-1.2.2-py2.7.egg#egg=keyring
106 # Pycrypto already built using python -c "import setuptools; execfile('setup.py')" bdist_egg
107- http://u1.to/ralsina/P/pycrypto-2.4.1-py2.7-win32.egg#egg=pycrypto
108+ http://u1.to/~brian.curtin/V/pycrypto-2.6-py2.7-win32.egg#egg=pycrypto
109 # Py2exe already build using python -c "import setuptools; execfile('setup.py')" bdist_egg
110 http://u1.to/ralsina/x/py2exe-0.6.9-py2.7-win32.egg#egg=py2exe
111 # Protobuf's upstream zip file doesn't work via easy_install so using an egg.
112 http://u1.to/ralsina/G/protobuf-2.4.1-py2.7.egg#egg=protobuf
113 # Comtypes has a bug in setup.py with Python 2.7, so this should be changed eventually
114 # http://sourceforge.net/tracker/index.php?func=detail&aid=3036368&group_id=115265&atid=692940
115- http://u1.to/ralsina/w/comtypes-0.6.2.zip#egg=comtypes
116+ http://u1.to/~brian.curtin/I/comtypes-0.6.2.zip#egg=comtypes
117 http://launchpad.net/configglue/trunk/1.0/+download/configglue-1.0.tar.gz#egg=configglue
118- http://u1.to/ralsina/7/Twisted-11.1.0-py2.7-win32.egg#egg=twisted
119+# This Twisted build includes alecu's patch which has not yet been accepted
120+# http://www.twistedmatrix.com/trac/ticket/5726
121+ http://u1.to/~brian.curtin/q/Twisted-12.3.0-py2.7-win32.egg#egg=twisted
122 http://people.canonical.com/~dobey/pyflakes-0.5.0-2ubuntu2.bo2.tar.gz#egg=pyflakes
123 http://u1.to/~mikemc/g/pyobjc_core-2.5.0b1-py2.7-macosx-10.6-x86_64.egg#egg=pyobjc-core-2.5.0b1
124 http://u1.to/~mikemc/7/pyobjc_framework_Cocoa-2.5.0b1-py2.7-macosx-10.6-x86_64.egg#egg=pyobjc-framework-Cocoa-2.5.0b1
125@@ -154,11 +156,11 @@
126 sys.path.insert(0, os.path.abspath("."))
127
128 [versions]
129-twisted = 11.1.0
130+twisted = 12.3.0
131 # qt4reactor does not go in here. Specifying the github link covers it.
132 python-distutils-extra = 2.31
133-keyring = 0.7
134-pycrypto = 2.4.1
135+keyring = 1.2.2
136+pycrypto = 2.6
137 pyOpenSSL = 0.13
138 pil = 1.1.7
139 httplib2 = 0.7.2
140@@ -171,7 +173,7 @@
141 pylint = 0.25.1
142 pyflakes = 0.5.0-2ubuntu2.bo2
143 pep8 = 1.2
144-oauth = 1.0.1
145+oauthlib = 0.3.7
146 py2exe = 0.6.9
147 comtypes = 0.6.2
148 pyobjc-core = 2.5.0b1
149@@ -193,4 +195,4 @@
150 urls =
151 lp:dirspec dirspec
152 lp:ubuntuone-dev-tools ubuntuone-dev-tools
153- lp:ubuntuone-storage-protocol ubuntuone-storage-protocol
154\ No newline at end of file
155+ lp:ubuntuone-storage-protocol ubuntuone-storage-protocol

Subscribers

People subscribed via source and target branches