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

[Brian Curtin]

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

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.

[dobey (dobey)]

review: Approve

[Mike McCracken (mikemc)]

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

=== modified file 'scripts/devsetup/README.txt'
--- scripts/devsetup/README.txt	2013-04-01 17:47:07 +0000
+++ scripts/devsetup/README.txt	2013-06-19 20:42:39 +0000
@@ -37,3 +37,15 @@
 from the buildout and place them in the bin folder as needed. Now your
 tests should be able to use this Python in this buildout and work without
 needed anything installed into your system's Python installation.
+
+Windows
+=======
+
+1. A patch binary is required to be on the path. You can obtain one via the
+gnuwin32 package: http://gnuwin32.sourceforge.net/
+
+2. Until https://github.com/garbas/collective.recipe.patch/pull/3 is pulled
+into the patch recipe and then re-released, you will need to make a simple
+change to the collective.recipe.patch egg. The easiest way to do this is to
+run "bin\buildout" once so that it obtains the recipe, fails to complete the
+patch, and then make the simple change in https://github.com/briancurtin/collective.recipe.patch/commit/38db262a37e1095c676c4ddecd149b03a83c7564
 
=== modified file 'scripts/devsetup/buildout.cfg'
--- scripts/devsetup/buildout.cfg	2013-05-03 19:13:20 +0000
+++ scripts/devsetup/buildout.cfg	2013-06-19 20:42:39 +0000
@@ -27,14 +27,14 @@
     https://github.com/ghtdak/qtreactor/tarball/master#egg=qt4reactor
     http://launchpad.net/python-distutils-extra/trunk/2.31/+download/python-distutils-extra-2.31.tar.gz#egg=python-distutils-extra
 # Pycrypto already built using python -c "import setuptools; execfile('setup.py')" bdist_egg
-    http://www.briancurtin.com/canonical/deps/pycrypto-2.6-py2.7-win32.egg#egg=pycrypto
+    https://launchpad.net/ubuntuone-windows-installer/stable-4-2/4.2.0/+download/pycrypto-2.6-py2.7-win32.egg#egg=pycrypto
 # Py2exe already build using python -c "import setuptools; execfile('setup.py')" bdist_egg
     http://u1.to/ralsina/x/py2exe-0.6.9-py2.7-win32.egg#egg=py2exe
 # Protobuf's upstream zip file doesn't work via easy_install so using an egg.
-    http://www.briancurtin.com/canonical/deps/protobuf-2.4.1-py2.7.egg#egg=protobuf
+    https://launchpad.net/ubuntuone-windows-installer/stable-4-2/4.2.0/+download/protobuf-2.4.1-py2.7.egg#egg=protobuf
 # Comtypes has a bug in setup.py with Python 2.7, so this should be changed eventually
 # http://sourceforge.net/tracker/index.php?func=detail&aid=3036368&group_id=115265&atid=692940
-    http://www.briancurtin.com/canonical/deps/comtypes-0.6.2.zip#egg=comtypes
+    https://launchpad.net/ubuntuone-windows-installer/stable-4-2/4.2.0/+download/comtypes-0.6.2.zip#egg=comtypes
     http://launchpad.net/configglue/trunk/1.0/+download/configglue-1.0.tar.gz#egg=configglue
     http://people.canonical.com/~dobey/pyflakes-0.5.0-2ubuntu2.bo2.tar.gz#egg=pyflakes
     http://u1.to/~mikemc/g/pyobjc_core-2.5.0b1-py2.7-macosx-10.6-x86_64.egg#egg=pyobjc-core-2.5.0b1
@@ -195,7 +195,7 @@
 configglue = 1.0.0
 logilab-astng = 0.23.1
 logilab-common = 0.57.1
-mocker = 1.1
+mocker = 1.1.1
 coverage = 3.5.1
 pylint = 0.25.1
 pyflakes = 0.5.0-2ubuntu2.bo2