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

Proposed by Brian Curtin
Status: Merged
Approved by: dobey
Approved revision: 176
Merged at revision: 174
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/buildout-dep-updates
Merge into: lp:ubuntuone-windows-installer
Diff against target: 50 lines (+16/-4)
2 files modified
scripts/devsetup/README.txt (+12/-0)
scripts/devsetup/buildout.cfg (+4/-4)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/buildout-dep-updates
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email:

Commit message

- Updated the mocker version and moved dependencies off of and into Launchpad.

Description of the change

A few changes to the Windows buildout setup.

1. comtypes, pycrypto, and protobuf eggs are now uploaded here in Launchpad rather than being stored on my website.
2. I added a note in the README about how the patch recipe works on Windows, requiring a patch binary. This isn't new, but was just undocumented. There's also a note about a minor change that needs to be made until the recipe makers accept the linked pull request and re-release it.
3. mocker 1.1 has disappeared from PyPI so I changed the pinned version to be mocker 1.1.1. It's not a "new" version, instead created in May of last year, but I've run the tests of our projects with this and they work fine with this point release.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Mike McCracken (mikemc) wrote :

Just for the record - this creates a working buildout on osx as well.

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 2013-04-01 17:47:07 +0000
3+++ scripts/devsetup/README.txt 2013-06-19 20:42:39 +0000
4@@ -37,3 +37,15 @@
5 from the buildout and place them in the bin folder as needed. Now your
6 tests should be able to use this Python in this buildout and work without
7 needed anything installed into your system's Python installation.
12+1. A patch binary is required to be on the path. You can obtain one via the
13+gnuwin32 package:
15+2. Until is pulled
16+into the patch recipe and then re-released, you will need to make a simple
17+change to the collective.recipe.patch egg. The easiest way to do this is to
18+run "bin\buildout" once so that it obtains the recipe, fails to complete the
19+patch, and then make the simple change in
21=== modified file 'scripts/devsetup/buildout.cfg'
22--- scripts/devsetup/buildout.cfg 2013-05-03 19:13:20 +0000
23+++ scripts/devsetup/buildout.cfg 2013-06-19 20:42:39 +0000
24@@ -27,14 +27,14 @@
27 # Pycrypto already built using python -c "import setuptools; execfile('')" bdist_egg
30 # Py2exe already build using python -c "import setuptools; execfile('')" bdist_egg
32 # Protobuf's upstream zip file doesn't work via easy_install so using an egg.
35 # Comtypes has a bug in with Python 2.7, so this should be changed eventually
36 #
42@@ -195,7 +195,7 @@
43 configglue = 1.0.0
44 logilab-astng = 0.23.1
45 logilab-common = 0.57.1
46-mocker = 1.1
47+mocker = 1.1.1
48 coverage = 3.5.1
49 pylint = 0.25.1
50 pyflakes = 0.5.0-2ubuntu2.bo2


People subscribed via source and target branches