Merge lp:~mikemc/ubuntuone-windows-installer/improve-buildout into lp:ubuntuone-windows-installer

[Mike McCracken]

- Generate all necessary scripts in buildout bin/ directory, and other improvements.

- Generate all necessary scripts in buildout bin/ directory, and other improvements:

- Use recipe that builds more capable python interpreter wrapper (accepts all cmdline args)

- Remove unused eggs

- change env.bat to not bother copying in scripts from eggs, because buildout does that now

- change env-mac to just set PATH and not go searching for scripts.

- Install dirspec and dev-tools as source and include them in default paths.

NOTE: we could take the same approach with the other branches, but since people may be grabbing different branches into different directories (ie, for testing) it seemed wise not to bake the path to e.g. parts/ubuntu-sso-client into the buildout scripts. Doing this for dirspec and dev-tools will make that a bit of a pain (need to use colo branches or move directories around) but they don't change that often, so hopefully it's OK.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~mikemc/ubuntuone-windows-installer/improve-buildout]

137. By Mike McCracken on 2012-08-15

set pep8 version to 1.2 to match Quantal

[dobey (dobey)]

review: Approve

=== modified file 'scripts/devsetup/buildout.cfg'
--- scripts/devsetup/buildout.cfg	2012-05-30 17:47:08 +0000
+++ scripts/devsetup/buildout.cfg	2012-08-15 19:37:29 +0000
@@ -1,7 +1,27 @@
+# The first time you run buildout, run 'bin/buildout install'.  
+
+# This will include the sourcedeps part that does a bzr branch for
+# dirspec and ubuntuone-dev-tools.  Because it does 'branch', if you
+# re-install sourcedeps when those branches are still there, you'll
+# get an error.
+
+# So if you need to run it again to re-generate something else, avoid
+# sourcedeps by passing the part of interest on the command line, like
+# 'bin/buildout install development'
+
+# NOTE: this config is a little extra complicated to ensure we get
+# u1lint and u1trial scripts installed despite dev-tools not using
+# setuptools, which is what the zc.recipe.egg or z3c.recipe.scripts
+# recipes expect.
+
 [buildout]
 parts =
+    pylint
+    pyflakes
+    u1lint
+    u1trial
+    sourcedeps
     development
-    windows
 
 find-links =
     https://github.com/ghtdak/qtreactor/tarball/master#egg=qt4reactor
@@ -18,15 +38,13 @@
 # http://sourceforge.net/tracker/index.php?func=detail&aid=3036368&group_id=115265&atid=692940
     http://u1.to/ralsina/w/comtypes-0.6.2.zip#egg=comtypes
     http://launchpad.net/configglue/trunk/1.0/+download/configglue-1.0.tar.gz#egg=configglue
-    http://launchpad.net/ubuntuone-dev-tools/stable-3-0/3.0.0/+download/ubuntuone-dev-tools-3.0.0.tar.gz#egg=ubuntuone-dev-tools
-    http://launchpad.net/dirspec/stable-3-0/3.0.0/+download/dirspec-3.0.0.tar.gz#egg=dirspec
     http://u1.to/ralsina/7/Twisted-11.1.0-py2.7-win32.egg#egg=twisted
 unzip = true
 newest = false
 versions = versions
 
 [windows]
-recipe =  zc.recipe.egg:scripts
+recipe =  zc.recipe.egg
 versions = versions
 eggs =
     py2exe
@@ -35,15 +53,16 @@
     ${development:eggs}
 interpreter = python
 
+# z3c.recipe.scripts generates a python interpreter that handles the
+# same python command line options as the real interpreter
 [development]
-recipe = zc.recipe.egg:scripts
+recipe = z3c.recipe.scripts
 eggs =
     twisted
     qt4reactor
     python-distutils-extra
     keyring
     pycrypto
-    lazr.restfulclient
     pyOpenSSL
     pil
     httplib2
@@ -53,15 +72,67 @@
     logilab-common
     mocker
     coverage
-    pylint
-    pyflakes
     pep8
-    ubuntuone-dev-tools
-    dirspec
     oauth
     simplejson
+    pylint
+    pyflakes
 versions = versions
 interpreter = python
+# Use extra-paths so generated python interpreter can see the source
+# version of dev-tools and dirspec.  We have to do this instead of
+# using the buildout 'develop' option that creates develop eggs
+# because that attempts to run ubuntuone-dev-tools setup, which fails
+# because it can't import dirspec yet.
+extra-paths = 
+     ${buildout:parts-directory}/ubuntuone-dev-tools
+     ${buildout:parts-directory}/dirspec
+
+# Install various scripts. These are all separate sections because the
+# initialization and arguments values apply to every entry point you
+# declare in a section, and these four are incompatible. Only pyflakes
+# requires no tweaking.
+
+[pyflakes]
+recipe = zc.recipe.egg
+eggs = ${development:eggs}
+versions = versions
+entry-points = 
+    pyflakes=pyflakes.scripts.pyflakes:main
+
+[pylint]
+recipe = zc.recipe.egg
+eggs = ${development:eggs}
+versions = versions
+arguments = sys.argv[1:]
+entry-points = pylint=pylint.lint:Run
+
+[u1lint]
+recipe = zc.recipe.egg:scripts
+eggs = ${development:eggs}
+versions = versions
+extra-paths = ${development:extra-paths}
+entry-points = u1lint=u1lintscript:main
+# The following is necessary because u1lint defines main() in the
+# runnable script, so the entry-point generated script needs to import
+# it
+initialization =
+    import imp
+    scriptname = "${buildout:parts-directory}/ubuntuone-dev-tools/bin/u1lint"
+    imp.load_source("u1lintscript", scriptname)
+
+[u1trial]
+recipe = zc.recipe.egg:scripts
+eggs = ${development:eggs}
+versions = versions
+extra-paths = ${development:extra-paths}
+entry-points = 
+    u1trial=ubuntuone.devtools.runners:main
+# The code at top-level in u1trial is simpler than u1lint, so we just
+# copy it here:
+initialization =
+    import os
+    sys.path.insert(0, os.path.abspath("."))
 
 [versions]
 twisted = 11.1.0
@@ -69,7 +140,6 @@
 python-distutils-extra = 2.31
 keyring = 0.7
 pycrypto = 2.4.1
-lazr.restfulclient = 0.12.0
 pyOpenSSL = 0.13
 pil = 1.1.7
 httplib2 = 0.7.2
@@ -81,9 +151,7 @@
 coverage = 3.5.1
 pylint = 0.25.1
 pyflakes = 0.5.0
-pep8 = 1.1
-ubuntuone-dev-tools = 3.0.0
-dirspec = 3.0.0
+pep8 = 1.2
 oauth = 1.0.1
 py2exe = 0.6.9
 comtypes = 0.6.2
@@ -93,6 +161,12 @@
 urls =    
     lp:ubuntuone-client ubuntuone-client
     lp:ubuntu-sso-client ubuntu-sso-client
-    lp:ubuntuone-storage-protocol ubuntuone-storage-protocol
     lp:ubuntuone-control-panel ubuntuone-control-panel
     lp:ubuntuone-windows-installer ubuntuone-windows-installer
+
+[sourcedeps]
+recipe = bazaarrecipeinfrae
+urls =
+    lp:ubuntuone-dev-tools ubuntuone-dev-tools
+    lp:dirspec dirspec
+    lp:ubuntuone-storage-protocol ubuntuone-storage-protocol
 \ No newline at end of file
 
=== modified file 'scripts/devsetup/env-mac'
--- scripts/devsetup/env-mac	2012-04-27 15:51:42 +0000
+++ scripts/devsetup/env-mac	2012-08-15 19:37:29 +0000
@@ -1,20 +1,6 @@
 #!/bin/bash
 
-CURRENT_DIR=`pwd`
-echo "Adding buildout bin path to the system path"
-PATH=`pwd`/bin:$PATH
-
-echo "Adding u1trial to env-vars"
-export u1trial="`find $CURRENT_DIR -type f -name u1trial`"
-
-echo "Adding u1lint to env-vars"
-export u1lint="`find $CURRENT_DIR -type f -name u1lint`"
-
-if [ ! -f `pwd`/bin/pylint ]; then
-    echo "Adding pylint script to the bin folder"
-    PYLINT_PATH="`find $CURRENT_DIR -type f -name pylint`"
-    PYLINT_SCRIPT="$CURRENT_DIR/bin/pylint"
-    echo "#!/usr/bin/env sh" > $PYLINT_SCRIPT
-    echo "python $PYLINT_PATH "'$@' >> $PYLINT_SCRIPT
-    chmod +x $PYLINT_SCRIPT
-fi
+export PATH=$PWD/bin:$PATH
+echo "Prepended pwd/bin to path. Contents:"
+ls -l bin
+
 
=== modified file 'scripts/devsetup/env.bat'
--- scripts/devsetup/env.bat	2012-06-21 16:55:22 +0000
+++ scripts/devsetup/env.bat	2012-08-15 19:37:29 +0000
@@ -14,44 +14,6 @@
 :: This will use the Python on the Path that we got from Buildout
 python.exe get_protoc.py
 
-
-FOR /F "tokens=*" %%A IN ('python -c "import sys;print [dir for dir in sys.path if \"ubuntuone-dev-tools\" in dir][0]"') DO SET DEVTOOLS=%%A
-FOR /F "tokens=*" %%A IN ('python -c "import sys;print [dir for dir in sys.path if \"pylint\" in dir][0]"') DO SET PYLINT=%%A
-FOR /F "tokens=*" %%A IN ('python -c "import sys;print [dir for dir in sys.path if \"pyflakes\" in dir][0]"') DO SET PYFLAKES=%%A
-
-IF EXIST "%~dp0bin\u1trial" GOTO TRIALALREADY
-echo Copying u1trial to bin
-copy %DEVTOOLS%\bin\u1trial bin
-copy %DEVTOOLS%\bin\u1trial.bat bin
-:TRIALALREADY
-
-IF EXIST "%~dp0bin\u1lint" GOTO LINTALREADY
-echo Copying u1lint to bin
-copy %DEVTOOLS%\bin\u1lint bin
-copy %DEVTOOLS%\bin\u1lint.bat bin
-:LINTALREADY
-
-IF EXIST "%~dp0bin\pylint" GOTO PYLINTALREADY
-echo Copying pylint to bin
-copy %PYLINT%\EGG-INFO\scripts\pylint bin
-copy %PYLINT%\\EGG-INFO\scripts\pylint.bat bin
-:PYLINTALREADY
-
-IF EXIST "%~dp0bin\pyflakes" GOTO PYFLAKESALREADY
-echo Copying pyflakes to bin
-copy %PYFLAKES%\pyflakes\scripts\pyflakes.py bin\pyflakes
-:PYFLAKESALREADY
-
-:: Running ubuntuone-control-panel tests requires -protocol to be built
-IF EXIST "%~dp0parts\ubuntuone-storage-protocol\build" GOTO PROTOCOLBUILT
-echo Building ubuntuone-storage-protocol
-cd parts\ubuntuone-storage-protocol
-python.exe setup.py install
-cd %~dp0
-:PROTOCOLBUILT
-
-
-
 :: Run all tests
 IF NOT "%1" == "testall" GOTO END