Merge lp:~bjornt/lazr-js/buildoutification into lp:lazr-js

[Björn Tillenius]

[Björn Tillenius (bjornt)]

This branch makes lazr-js use buildout to handle dependencies, and makes
it possible for LP to use lazr-js as an egg (via an sdist of course).

There are quite a lot of changes in this branch, and there as still a
few unknowns. First of all, don't be fooled by the diff size. It's over
800 lines, but if you remove bootstrap.py and ez_setup.py (which are
simple copies from LP trun), it's down to a more managable 375 lines.

I've moved all the python code that was lying around into the src-py
directory (I used src-py, since we also have js files, which are in
src-js). All of our code is in a lazr.js package, and the form tools are
now in bin/. I modified them to have a main() function, so it's easy to
generate these scripts using buildout.

Please review the setup.py extra carefully. I wasn't quite sure how to
get the javascript files included, but at least it's working now. Maybe
there is some better way of doing it?

Another thing I'm not sure about is the versions specified in
buildout.cfg. I simply copied the versions from LP's buildout.cfg.

I also modified build.py to include the yui when building the javascript
files. It's only included when building the lazr-js widgets. If
bin/build is used to build other javascript files, it's not included.

Not that I haven't bother about explaining how to set up the
download-cache if it doesn't exist. I used LP's one when testing, but I
intend to make sure that we have a special one of lazr. There is
already a branch for it, but I wanted to get this one landed first,
since we don't need to for LP.

See also lp:~bjornt/launchpad/lazrjs-buildout, which is the branch that
makes use of lazr-js using buildout, and removes it from sourcecode/.

--
Björn Tillenius | https://launchpad.net/~bjornt

[Björn Tillenius (bjornt)]

The MP for lp:~bjornt/launchpad/lazrjs-buildout is at https://code.edge.launchpad.net/~bjornt/launchpad/lazrjs-buildout/+merge/13004

[Gary Poster (gary)]

Hi Bjorn. This is great to see.

I think we can simplify the setup. I don't know if we need as many of the tricks that Launchpad uses. Here's a diff that removes a lot of them. This should be regarded as a conversation starter, rather than as a concrete suggestion. I'll call out the ideas here, and then you can see them concretely in the diff. I've marked the items that I strongly think are valid with three stars (***).

- Launchpad keeps a separate, shared download-cache and eggs. That makes sense if the build is happening on a machine that does not allow network access, or if we want to prevent being exposed to PyPI service interruptions, or if we want to use custom distributions. On the other hand, if we remove that, we can have a simpler build. If developers want shared eggs, they can set up a global cache (https://dev.launchpad.net/HackingLazrLibraries#Global%20Cache). This change affects .bzrignore, and the Makefile (including the bin/buildout target).

- I don't see any reason to specify the BUILDOUT_CFG in the Makefile. There's only one.

- ``make clean`` might as well just trash the bin directory. ***

- We can just use the interpreter option for zc.recipe.egg to produce the py file, and remove the z3c.recipe.filetemplate dependency (and the buildout-templates directory). We made the py file in Launchpad like that because Launchpad's Makefile wanted to use the -t option. (I have a branch I'm working on for Launchpad that switches it to using the interpreter option also.) ***

- The entry points maybe ought to be in the setup.py file, so someone can use it without buildout. Maybe. Anyway, might as well put it in the expected place. ***

- No need to specify extra-paths in buildout.cfg. You are already doing the right thing in setup.py. ***

- If we change the Makefile to use -S whenever it calls Python, we don't need my custom releases of buildout that handle a system Python (which Jim still has on his queue to review), so we can just use released versions of the various packages. (On the other hand, if Jim approves my changes, we could arguably just get rid of the Makefile entirely and instruct people to run ``python bootstrap.py && bin/buildout && bin/build`` or something to get the build.)

- Including ez_setup.py was another artifact of wanting to be able to build on a machine that had no outside net access. If we don't need to support that, we can remove it (and the reference in setup.py).

If you agree with all of these thoughts, you can take the diff as is. Otherwise, hopefully it will still give us something to talk about it. If you just change the starred items, and push back convincingly on the rest, that will probably be fine.

Thanks!

Gary

=== modified file '.bzrignore'
--- .bzrignore 2009-09-23 13:25:32 +0000
+++ .bzrignore 2009-10-07 19:34:10 +0000
@@ -7,6 +7,4 @@
 parts
 src/inlineedit/assets/skins/sam/inlineedit.css
 src/lazr/assets/skins/sam/lazr.css
-./download-cache
-./eggs
 ./MANIFEST

=== modified file 'Makefile'
--- Makefile 2009-10-07 15:42:30 +0000
+++ Makefile 2009-10-07 19:58:20 +0000
@@ -5,35 +5,21 @@
 PYTHON=python${PYTHON_VERSION}
 WD:=$(shell pwd)
 PY=$(WD)/bin/py
-BUILDOUT_CFG=bu...

review: Needs Fixing

[lp:~bjornt/lazr-js/buildoutification]

119. By Björn Tillenius on 2009-10-08

Don't specify BUILDOUT_CFG in the Makefile, since we have only one config.

120. By Björn Tillenius on 2009-10-08

Trash the whole bin/ directory in 'make clean'.

121. By Björn Tillenius on 2009-10-08

Get rid of buildout-templates.

122. By Björn Tillenius on 2009-10-08

Specify which scripts should be generated in setup.py instead of in buildout.cfg.

123. By Björn Tillenius on 2009-10-08

No need to depend on z.recipe.filetemplate anymore.

[Björn Tillenius (bjornt)]

On Wed, Oct 07, 2009 at 08:11:57PM -0000, Gary Poster wrote:
> Review: Needs Fixing
> Hi Bjorn. This is great to see.
>
> I think we can simplify the setup. I don't know if we need as many of
> the tricks that Launchpad uses. Here's a diff that removes a lot of
> them. This should be regarded as a conversation starter, rather than as
> a concrete suggestion. I'll call out the ideas here, and then you can
> see them concretely in the diff. I've marked the items that I strongly
> think are valid with three stars (***).

Right, I was meaning for this MP to be the start of a conversation, so
that we had a diff we could look at. Many of the things I simply took
from LP.

> - Launchpad keeps a separate, shared download-cache and eggs. That
> makes sense if the build is happening on a machine that does not allow
> network access, or if we want to prevent being exposed to PyPI service
> interruptions, or if we want to use custom distributions. On the other
> hand, if we remove that, we can have a simpler build. If developers
> want shared eggs, they can set up a global cache
> (https://dev.launchpad.net/HackingLazrLibraries#Global%20Cache). This
> change affects .bzrignore, and the Makefile (including the bin/buildout
> target).

There is some value in always using a download-cache. The main reason is
would be to help people remember adding things to the download-cache
branch, whenever they add a new dependencies. We do have want to run
tests using PQM or buildbot, and those machines won't have net access.
Although, I said I wanted to worry about this after landing this branch
(since for LP to use it it doesn't matter), so I guess I could remove it
for now, and we can decide what to do later.

> - I don't see any reason to specify the BUILDOUT_CFG in the Makefile.
> There's only one.

Right, this was copied from LP; removed.

> - ``make clean`` might as well just trash the bin directory. ***

Right, makes sense; done.

> - We can just use the interpreter option for zc.recipe.egg to produce
> the py file, and remove the z3c.recipe.filetemplate dependency (and the
> buildout-templates directory). We made the py file in Launchpad like
> that because Launchpad's Makefile wanted to use the -t option. (I have
> a branch I'm working on for Launchpad that switches it to using the
> interpreter option also.) ***

Indeed, this is simpler, this was another copy from LP. I've changed it
to use the interpreter option and removed the z3c.recipe.filetemplate
dependency.

> - The entry points maybe ought to be in the setup.py file, so someone
> can use it without buildout. Maybe. Anyway, might as well put it in
> the expected place. ***

Yep, having them in setup.py is better, I didn't know that it was
enough. Fixed.

> - No need to specify extra-paths in buildout.cfg. You are already
> doing the right thing in setup.py. ***

Yes. It was necessary at one point, but now it's not needed anymore, so
I've removed it.

> - If we change the Makefile to use -S whenever it calls Python, we
> don't need my custom releases of buildout that handle a system Python
> (which Jim still has on his queue to review), so we can just use
> released versions of the...

[Gary Poster (gary)]

On Oct 8, 2009, at 9:24 AM, Björn Tillenius wrote:

> On Wed, Oct 07, 2009 at 08:11:57PM -0000, Gary Poster wrote:
>> Review: Needs Fixing
>> Hi Bjorn. This is great to see.
>>
>> I think we can simplify the setup. I don't know if we need as many
>> of
>> the tricks that Launchpad uses. Here's a diff that removes a lot of
>> them. This should be regarded as a conversation starter, rather
>> than as
>> a concrete suggestion. I'll call out the ideas here, and then you
>> can
>> see them concretely in the diff. I've marked the items that I
>> strongly
>> think are valid with three stars (***).
>
> Right, I was meaning for this MP to be the start of a conversation, so
> that we had a diff we could look at. Many of the things I simply took
> from LP.

Cool.

>> - Launchpad keeps a separate, shared download-cache and eggs. That
>> makes sense if the build is happening on a machine that does not
>> allow
>> network access, or if we want to prevent being exposed to PyPI
>> service
>> interruptions, or if we want to use custom distributions. On the
>> other
>> hand, if we remove that, we can have a simpler build. If developers
>> want shared eggs, they can set up a global cache
>> (https://dev.launchpad.net/HackingLazrLibraries#Global%20Cache).
>> This
>> change affects .bzrignore, and the Makefile (including the bin/
>> buildout
>> target).
>
> There is some value in always using a download-cache.

Agreed. There are other ways to get some of the same value (a repo
managed by Canonical/Launchpad would give us the benefit of protection
from PyPI outages, for instance). But still agreed.

> The main reason is
> would be to help people remember adding things to the download-cache
> branch, whenever they add a new dependencies. We do have want to run
> tests using PQM or buildbot, and those machines won't have net access.

buildbot has net access, but PQM doesn't. Sometimes developers don't
have net access, also, and a download-cache lets them be productive
then.

> Although, I said I wanted to worry about this after landing this
> branch
> (since for LP to use it it doesn't matter), so I guess I could
> remove it
> for now, and we can decide what to do later.

I don't have a strong opinion about it. I just want to point out some
possible simplifications for your consideration.

...

>> - If we change the Makefile to use -S whenever it calls Python, we
>> don't need my custom releases of buildout that handle a system Python
>> (which Jim still has on his queue to review), so we can just use
>> released versions of the various packages. (On the other hand, if
>> Jim
>> approves my changes, we could arguably just get rid of the Makefile
>> entirely and instruct people to run ``python bootstrap.py &&
>> bin/buildout && bin/build`` or something to get the build.)
>
> So, I think this change sounds good, but could you expand a bit more
> on
> that the difference between 'python -S bin/build' and 'bin/build'
> is? I
> don't quite understand why the former is better.

Because not running site.py (python -S) means that site-packages are
not included, which means that we don't get complications from using a
...

[Gary Poster (gary)]

Thank you again

review: Approve

[lp:~bjornt/lazr-js/buildoutification]

124. By Björn Tillenius on 2009-10-26

Use python -S.

125. By Björn Tillenius on 2009-10-27

Remove unused config options.

=== modified file '.bzrignore'
--- .bzrignore	2009-01-07 19:57:04 +0000
+++ .bzrignore	2009-10-27 09:01:09 +0000
@@ -1,3 +1,12 @@
+.installed.cfg
+./bin
 build/*
+develop-eggs
+dist
+lib/*.egg-info
+parts
 src/inlineedit/assets/skins/sam/inlineedit.css
 src/lazr/assets/skins/sam/lazr.css
+./download-cache
+./eggs
+./MANIFEST

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2009-10-27 09:01:09 +0000
@@ -0,0 +1,5 @@
+include *.txt Makefile
+recursive-include examples/ *
+recursive-include src-py *
+recursive-include src-js *
+include ez_setup.py

=== modified file 'Makefile'
--- Makefile	2009-03-13 19:23:08 +0000
+++ Makefile	2009-10-27 09:01:09 +0000
@@ -1,15 +1,38 @@
 # Simple makefile for lazr-js.
 #
 #
+PYTHON_VERSION=
+PYTHON=python${PYTHON_VERSION}
+WD:=$(shell pwd)
+PY=$(WD)/bin/py
 
 # Update the build directory
-build:
-	$(PYTHON) tools/build.py
+build: $(PY)
+	$(PYTHON) -S bin/build
 
 lint:
-	$(PYTHON) tools/jslint.py
+	$(PYTHON) -S bin/jslint
+
+eggs:
+	mkdir eggs
+
+download-cache:
+	@$echo "Missing ./download-cache."
+	@exit 1
+
+# The download-cache dependency comes *before* eggs so that developers get the
+# warning before the eggs directory is made.  The target for the eggs directory
+# is only there for deployment convenience.
+bin/buildout: download-cache eggs
+	$(SHHH) $(PYTHON) -S bootstrap.py\
+                --ez_setup-source=ez_setup.py \
+		--download-base=download-cache/dist --eggs=eggs
+
+$(PY): bin/buildout buildout.cfg setup.py
+	$(PYTHON) -S ./bin/buildout
+
 
 clean:
-	rm -fr build/*
+	rm -fr build/* bin
 
 .PHONY: build lint clean

=== added file 'README.txt'
--- README.txt	1970-01-01 00:00:00 +0000
+++ README.txt	2009-10-27 09:01:09 +0000
@@ -0,0 +1,14 @@
+Lazr-JS: Sleek and sexy AJAX widgets for the new web
+====================================================
+
+This is a collection of AJAX-ready widgets building on YUI3.
+
+ * anim:: useful animations.
+ * choiceedit:: picker for a small list of choices
+ * formoverlay:: AJAXIFY a regular web form
+ * inlineedit:: inline text editor
+ * lazr:: utility modules
+ * overlay:: a popup window
+ * picker:: searchable vocabulary picker
+ * testing:: test framework
+

=== added file 'bootstrap.py'
--- bootstrap.py	1970-01-01 00:00:00 +0000
+++ bootstrap.py	2009-10-27 09:01:09 +0000
@@ -0,0 +1,170 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+
+$Id: bootstrap.py 101930 2009-07-15 18:34:35Z gary $
+"""
+
+import os, re, shutil, sys, tempfile, textwrap, urllib, urllib2
+
+# We have to manually parse our options rather than using one of the stdlib
+# tools because we want to pass the ones we don't recognize along to
+# zc.buildout.buildout.main.
+
+configuration = {
+    '--ez_setup-source': 'http://peak.telecommunity.com/dist/ez_setup.py',
+    '--version': '',
+    '--download-base': None,
+    '--eggs': None}
+
+helpstring = __doc__ + textwrap.dedent('''
+    This script recognizes the following options itself.  The first option it
+    encounters that is not one of these will cause the script to stop parsing
+    options and pass the rest on to buildout.  Therefore, if you want to use
+    any of the following options *and* buildout command-line options like
+    -c, first use the following options, and then use the buildout options.
+
+    Options: 
+      --version=ZC_BUILDOUT_VERSION
+                Specify a version number of the zc.buildout to use
+      --ez_setup-source=URL_OR_FILE
+                Specify a URL or file location for the ez_setup file.
+                Defaults to
+                %(--ez_setup-source)s
+      --download-base=URL_OR_DIRECTORY
+                Specify a URL or directory for downloading setuptools and
+                zc.buildout.  Defaults to PyPI.
+      --eggs=DIRECTORY
+                Specify a directory for storing eggs.  Defaults to a temporary
+                directory that is deleted when the bootstrap script completes.
+
+    By using --ez_setup-source and --download-base to point to local resources,
+    you can keep this script from going over the network.
+    ''' % configuration)
+match_equals = re.compile(r'(%s)=(.*)' % ('|'.join(configuration),)).match
+args = sys.argv[1:]
+if args == ['--help']:
+    print helpstring
+    sys.exit(0)
+
+# If we end up using a temporary directory for storing our eggs, this will
+# hold the path of that directory.  On the other hand, if an explicit directory
+# is specified in the argv, this will remain None.
+tmpeggs = None
+
+while args:
+    val = args[0]
+    if val in configuration:
+        del args[0]
+        if not args or args[0].startswith('-'):
+            print "ERROR: %s requires an argument."
+            print helpstring
+            sys.exit(1)
+        configuration[val] = args[0]
+    else:
+        match = match_equals(val)
+        if match and match.group(1) in configuration:
+            configuration[match.group(1)] = match.group(2)
+        else:
+            break
+    del args[0]
+
+for name in ('--ez_setup-source', '--download-base'):
+    val = configuration[name]
+    if val is not None and '://' not in val: # We're being lazy.
+        configuration[name] = 'file://%s' % (
+            urllib.pathname2url(os.path.abspath(os.path.expanduser(val))),)
+
+if (configuration['--download-base'] and
+    not configuration['--download-base'].endswith('/')):
+    # Download base needs a trailing slash to make the world happy.
+    configuration['--download-base'] += '/'
+
+if not configuration['--eggs']:
+    configuration['--eggs'] = tmpeggs = tempfile.mkdtemp()
+else:
+    configuration['--eggs'] = os.path.abspath(
+        os.path.expanduser(configuration['--eggs']))
+
+# The requirement is what we will pass to setuptools to specify zc.buildout.
+requirement = 'zc.buildout'
+if configuration['--version']:
+    requirement += '==' + configuration['--version']
+
+try:
+    import setuptools # A flag.  Sometimes pkg_resources is installed alone.
+    import pkg_resources
+except ImportError:
+    ez = {}
+    exec urllib2.urlopen(configuration['--ez_setup-source']).read() in ez
+    setuptools_args = dict(to_dir=configuration['--eggs'], download_delay=0)
+    if configuration['--download-base']:
+        setuptools_args['download_base'] = configuration['--download-base']
+    ez['use_setuptools'](**setuptools_args)
+    import pkg_resources
+    # This does not (always?) update the default working set.  We will
+    # do it.
+    for path in sys.path:
+        if path not in pkg_resources.working_set.entries:
+            pkg_resources.working_set.add_entry(path)
+
+if sys.platform == 'win32':
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
+cmd = [quote(sys.executable),
+       '-c',
+       quote('from setuptools.command.easy_install import main; main()'),
+       '-mqNxd',
+       quote(configuration['--eggs'])]
+
+if configuration['--download-base']:
+    cmd.extend(['-f', quote(configuration['--download-base'])])
+
+cmd.append(requirement)
+
+ws = pkg_resources.working_set
+env = dict(
+    os.environ,
+    PYTHONPATH=ws.find(pkg_resources.Requirement.parse('setuptools')).location)
+
+is_jython = sys.platform.startswith('java')
+if is_jython:
+    import subprocess
+    exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows needs this, apparently; otherwise we would prefer subprocess
+    exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+    sys.stdout.flush()
+    print ("An error occured when trying to install zc.buildout. "
+           "Look above this message for any errors that "
+           "were output by easy_install.")
+    sys.exit(exitcode)
+
+ws.add_entry(configuration['--eggs'])
+ws.require(requirement)
+import zc.buildout.buildout
+args.append('bootstrap')
+zc.buildout.buildout.main(args)
+if tmpeggs is not None:
+    shutil.rmtree(tmpeggs)

=== added file 'buildout.cfg'
--- buildout.cfg	1970-01-01 00:00:00 +0000
+++ buildout.cfg	2009-10-27 09:01:09 +0000
@@ -0,0 +1,32 @@
+[buildout]
+develop = .
+parts =
+    scripts
+
+unzip = true
+eggs-directory = eggs
+download-cache = download-cache
+
+# Disable this option temporarily if you want buildout to find software
+# dependencies *other* than those in our download-cache.  Once you have the
+# desired software, reenable this option (and check in the new software to
+# lp:lp-source-dependencies if this is going to be reviewed/merged/deployed.)
+install-from-cache = true
+
+allow-picked-versions = false
+
+prefer-final = true
+
+versions = versions
+
+[scripts]
+recipe = zc.recipe.egg
+interpreter = py
+eggs = lazr-js
+
+[versions]
+# Alphabetical, case-insensitive, please! :-)
+bzr = 2.0.0
+setuptools = 0.6c9
+zc.buildout = 1.4.1
+zc.recipe.egg = 1.2.2

=== added file 'ez_setup.py'
--- ez_setup.py	1970-01-01 00:00:00 +0000
+++ ez_setup.py	2009-10-27 09:01:09 +0000
@@ -0,0 +1,275 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from ez_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6c9"
+DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+md5_data = {
+    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
+    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
+    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
+    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
+    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
+    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
+    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
+    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
+    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
+    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
+    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
+    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
+    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
+    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
+    'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
+    'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
+    'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
+    'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
+}
+
+import sys, os
+try: from hashlib import md5
+except ImportError: from md5 import md5
+
+def _validate_md5(egg_name, data):
+    if egg_name in md5_data:
+        digest = md5(data).hexdigest()
+        if digest != md5_data[egg_name]:
+            print >>sys.stderr, (
+                "md5 validation of %s failed!  (Possible download problem?)"
+                % egg_name
+            )
+            sys.exit(2)
+    return data
+
+def use_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+    download_delay=15
+):
+    """Automatically find/download setuptools and make it available on sys.path
+
+    `version` should be a valid setuptools version number that is available
+    as an egg for download under the `download_base` URL (which should end with
+    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
+    it is not already available.  If `download_delay` is specified, it should
+    be the number of seconds that will be paused before initiating a download,
+    should one be required.  If an older version of setuptools is installed,
+    this routine will print a message to ``sys.stderr`` and raise SystemExit in
+    an attempt to abort the calling script.
+    """
+    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+    def do_download():
+        egg = download_setuptools(version, download_base, to_dir, download_delay)
+        sys.path.insert(0, egg)
+        import setuptools; setuptools.bootstrap_install_from = egg
+    try:
+        import pkg_resources
+    except ImportError:
+        return do_download()       
+    try:
+        pkg_resources.require("setuptools>="+version); return
+    except pkg_resources.VersionConflict, e:
+        if was_imported:
+            print >>sys.stderr, (
+            "The required version of setuptools (>=%s) is not available, and\n"
+            "can't be installed while this script is running. Please install\n"
+            " a more recent version first, using 'easy_install -U setuptools'."
+            "\n\n(Currently using %r)"
+            ) % (version, e.args[0])
+            sys.exit(2)
+        else:
+            del pkg_resources, sys.modules['pkg_resources']    # reload ok
+            return do_download()
+    except pkg_resources.DistributionNotFound:
+        return do_download()
+
+def download_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+    delay = 15
+):
+    """Download setuptools from a specified location and return its filename
+
+    `version` should be a valid setuptools version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    `delay` is the number of seconds to pause before an actual download attempt.
+    """
+    import urllib2, shutil
+    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+    url = download_base + egg_name
+    saveto = os.path.join(to_dir, egg_name)
+    src = dst = None
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            from distutils import log
+            if delay:
+                log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help).  I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+   %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+                    version, download_base, delay, url
+                ); from time import sleep; sleep(delay)
+            log.warn("Downloading %s", url)
+            src = urllib2.urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = _validate_md5(egg_name, src.read())
+            dst = open(saveto,"wb"); dst.write(data)
+        finally:
+            if src: src.close()
+            if dst: dst.close()
+    return os.path.realpath(saveto)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+def main(argv, version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    try:
+        import setuptools
+    except ImportError:
+        egg = None
+        try:
+            egg = download_setuptools(version, delay=0)
+            sys.path.insert(0,egg)
+            from setuptools.command.easy_install import main
+            return main(list(argv)+[egg])   # we're done here
+        finally:
+            if egg and os.path.exists(egg):
+                os.unlink(egg)
+    else:
+        if setuptools.__version__ == '0.0.1':
+            print >>sys.stderr, (
+            "You have an obsolete version of setuptools installed.  Please\n"
+            "remove it from your system entirely before rerunning this script."
+            )
+            sys.exit(2)
+
+    req = "setuptools>="+version
+    import pkg_resources
+    try:
+        pkg_resources.require(req)
+    except pkg_resources.VersionConflict:
+        try:
+            from setuptools.command.easy_install import main
+        except ImportError:
+            from easy_install import main
+        main(list(argv)+[download_setuptools(delay=0)])
+        sys.exit(0) # try to force an exit
+    else:
+        if argv:
+            from setuptools.command.easy_install import main
+            main(argv)
+        else:
+            print "Setuptools version",version,"or greater has been installed."
+            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+def update_md5(filenames):
+    """Update our built-in md5 registry"""
+
+    import re
+
+    for name in filenames:
+        base = os.path.basename(name)
+        f = open(name,'rb')
+        md5_data[base] = md5(f.read()).hexdigest()
+        f.close()
+
+    data = ["    %r: %r,\n" % it for it in md5_data.items()]
+    data.sort()
+    repl = "".join(data)
+
+    import inspect
+    srcfile = inspect.getsourcefile(sys.modules[__name__])
+    f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+    match = re.search("\nmd5_data = {\n([^}]+)}", src)
+    if not match:
+        print >>sys.stderr, "Internal error!"
+        sys.exit(2)
+
+    src = src[:match.start(1)] + repl + src[match.end(1):]
+    f = open(srcfile,'w')
+    f.write(src)
+    f.close()
+
+
+if __name__=='__main__':
+    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+        update_md5(sys.argv[2:])
+    else:
+        main(sys.argv[1:])
+
+
+
+
+

=== removed symlink 'lib/lazr/build'
=== target was '../../build'
=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2009-10-27 09:01:09 +0000
@@ -0,0 +1,47 @@
+# Copyright 2009 Canonical Ltd.  All rights reserved.
+
+import ez_setup
+ez_setup.use_setuptools()
+
+import sys
+from setuptools import setup, find_packages
+
+__version__ = '0.9'
+
+
+setup(
+    name='lazr-js',
+    namespace_packages=['lazr'],
+    version=__version__,
+    packages=['lazr', 'lazrjs'],
+    py_modules=['jsmin', 'slimmer'],
+    package_dir={
+        'lazrjs': 'src-js/lazrjs',
+        '': 'src-py'},
+    include_package_data=True,
+    zip_safe=False,
+    maintainer='Canonical JavaScripters',
+    maintainer_email='[e-mail]',
+    description=('Collection of JS widgets'),
+    license='GPL v3',
+    install_requires=[
+        'bzr',
+        'setuptools',
+    ],
+    url='https://launchpad.net/lazr-js',
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Programming Language :: JavaScript",
+        "Programming Language :: Python",
+    ],
+    extras_require=dict(
+    ),
+    entry_points=dict(
+        console_scripts=[
+            'build=lazr.js.build:main',
+            'jslint=lazr.js.jslint:main',
+            'scaffold=lazr.js.scaffold:main',
+        ]
+    ),
+)

=== renamed directory 'src' => 'src-js'
=== added directory 'src-js/lazrjs'
=== added file 'src-js/lazrjs/__init__.py'
=== renamed directory 'src/activator' => 'src-js/lazrjs/activator'
=== renamed directory 'src/anim' => 'src-js/lazrjs/anim'
=== renamed directory 'src/autocomplete' => 'src-js/lazrjs/autocomplete'
=== renamed directory 'src/choiceedit' => 'src-js/lazrjs/choiceedit'
=== renamed directory 'src/effects' => 'src-js/lazrjs/effects'
=== renamed directory 'src/formoverlay' => 'src-js/lazrjs/formoverlay'
=== renamed directory 'src/inlineedit' => 'src-js/lazrjs/inlineedit'
=== renamed directory 'src/lazr' => 'src-js/lazrjs/lazr'
=== renamed directory 'src/overlay' => 'src-js/lazrjs/overlay'
=== renamed directory 'src/picker' => 'src-js/lazrjs/picker'
=== renamed directory 'src/testing' => 'src-js/lazrjs/testing'
=== renamed directory 'lib/yui' => 'src-js/lazrjs/yui'
=== renamed directory 'lib' => 'src-py'
=== added file 'src-py/lazr/__init__.py'
--- src-py/lazr/__init__.py	1970-01-01 00:00:00 +0000
+++ src-py/lazr/__init__.py	2009-10-27 09:01:09 +0000
@@ -0,0 +1,8 @@
+# This is a namespace package.
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
+

=== added directory 'src-py/lazr/js'
=== added file 'src-py/lazr/js/__init__.py'
=== renamed file 'tools/build.py' => 'src-py/lazr/js/build.py'
--- tools/build.py	2009-01-09 16:02:00 +0000
+++ src-py/lazr/js/build.py	2009-10-27 09:01:09 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 """build.py - Minifies and creates the JS build directory."""
 
 __metaclass__ = type
@@ -13,14 +11,14 @@
 
 from glob import glob
 
+import pkg_resources
+
 HERE = os.path.dirname(__file__)
-BUILD_DIR = os.path.normpath(os.path.join(HERE, '..', 'build'))
-SRC_DIR = os.path.normpath(os.path.join(HERE, '..', 'src'))
-LIB_DIR = os.path.normpath(os.path.join(HERE, '../', 'lib'))
-
-# Add the ../lib directory to the python path
-sys.path.insert(0, LIB_DIR)
-
+BUILD_DIR = os.path.normpath(os.path.join(HERE, '..', '..', '..', 'build'))
+SRC_DIR = pkg_resources.resource_filename(
+    pkg_resources.Requirement.parse("lazr-js"), "lazrjs")
+
+import lazrjs
 from jsmin import JavascriptMinify
 from slimmer import css_slimmer
 
@@ -122,6 +120,9 @@
             self.extra_files = []
         else:
             self.extra_files = extra_files
+        # If we build the lazr-js widgets, make sure that YUI source is
+        # included as well, since we depend on it being available.
+        self.include_yui = (src_dir == SRC_DIR)
 
     def log(self, msg):
         sys.stdout.write(msg + '\n')
@@ -314,15 +315,26 @@
 
     def do_build(self):
         for name, cpath in self.find_components():
+            files_to_link = glob(os.path.join(cpath, '*.js'))
+            if len(files_to_link) == 0:
+                continue
             self.ensure_build_directory(name)
 
-            for js_file in glob(os.path.join(cpath, '*.js')):
+            for js_file in files_to_link:
                 self.link_and_minify(name, js_file)
 
             self.build_assets(name)
 
         self.update_combined_js_file()
         self.update_combined_css_skins()
+        if self.include_yui:
+            self.link_yui_directory()
+
+    def link_yui_directory(self):
+        """Link to the built yui source directory."""
+        yui_directory = os.path.join(os.path.dirname(lazrjs.__file__), 'yui')
+        link_location = os.path.join(self.build_dir, 'yui')
+        self.ensure_link(yui_directory, link_location)
 
 
 def get_options():
@@ -345,7 +357,7 @@
     return parser.parse_args()
 
 
-if __name__ == '__main__':
+def main():
    options, extra= get_options()
    Builder(
        name=options.name,

=== renamed file 'lib/fulljslint.js' => 'src-py/lazr/js/fulljslint.js'
=== renamed file 'tools/jslint-wrapper.js' => 'src-py/lazr/js/jslint-wrapper.js'
=== renamed file 'tools/jslint.py' => 'src-py/lazr/js/jslint.py'
--- tools/jslint.py	2009-01-05 23:05:43 +0000
+++ src-py/lazr/js/jslint.py	2009-10-27 09:01:09 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/python
 """jslint.py - run the JSLint linter ."""
 
 __metaclass__ = type
@@ -13,7 +12,7 @@
 from bzrlib.plugin import load_plugins
 
 HERE = os.path.join(os.path.dirname(__file__))
-FULLJSLINT = os.path.join(HERE, os.path.pardir, 'lib', 'fulljslint.js')
+FULLJSLINT = os.path.join(HERE, 'fulljslint.js')
 JSLINT_WRAPPER = os.path.join(HERE, 'jslint-wrapper.js')
 
 
@@ -159,7 +158,7 @@
     return options, args
 
 
-if __name__ == '__main__':
+def main():
     load_plugins()
     options, args = get_options()
     linter = JSLinter(options.options)

=== renamed file 'tools/scaffold.py' => 'src-py/lazr/js/scaffold.py'
--- tools/scaffold.py	2009-03-19 14:24:56 +0000
+++ src-py/lazr/js/scaffold.py	2009-10-27 09:01:09 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/python
 """
 A script to automatically create the files for a new widget.
 
@@ -70,7 +69,7 @@
     test_js_template = find_path(skel_dir, 'template.test-js')
     example_template = find_path(skel_dir, 'template.example')
     css_template = find_path(skel_dir, 'template.css')
-    src_dir = find_path('.', 'src')
+    src_dir = find_path('.', 'src-js')
     example_dir = find_path('.', 'examples')
 
     def write_file(template, dest):
@@ -100,7 +99,7 @@
     write_file(example_template, join(example, 'index.html'))
 
 
-if __name__ == '__main__':
+def main():
     if len(sys.argv) != 2:
         print usage
         sys.exit(1)

=== renamed directory 'tools/skel' => 'src-py/lazr/js/skel'
=== added symlink 'src-py/lazrjs'
=== target is u'../src-js/lazrjs'