Upgrade dependencies and switch to setuptools

Author: florentx

README.rst

@@ -44,9 +44,9 @@ If PostgreSQL is already installed on a separate server, adapt this step.
 --------------------
 ::
 
- $ mkvirtualenv -p python2.6 --no-site-packages oe
+ $ mkvirtualenv -p python2.6 --no-site-packages --setuptools oe
  $ workon oe
- $ pip install -U pip distribute
+ $ pip install -U pip setuptools
  $ pip install Babel
  $ pip freeze
 

bootstrap.py

@@ -18,7 +18,11 @@
 use the -c option to specify an alternate configuration file.
 """
 
-import os, shutil, sys, tempfile
+import os
+import shutil
+import sys
+import tempfile
+
 from optparse import OptionParser
 
 tmpeggs = tempfile.mkdtemp()
@@ -31,8 +35,8 @@
 Simply run this script in a directory containing a buildout.cfg, using the
 Python that you want bin/buildout to use.
 
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
+Note that by using --find-links to point to local resources, you can keep 
+this script from going over the network.
 '''
 
 parser = OptionParser(usage=usage)
@@ -48,23 +52,21 @@
                         "bootstrap and buildout will get the newest releases "
                         "even if they are alphas or betas."))
 parser.add_option("-c", "--config-file",
-                   help=("Specify the path to the buildout configuration "
-                         "file to be used."))
+                  help=("Specify the path to the buildout configuration "
+                        "file to be used."))
 parser.add_option("-f", "--find-links",
-                   help=("Specify a URL to search for buildout releases"))
+                  help=("Specify a URL to search for buildout releases"))
 
 
 options, args = parser.parse_args()
 
 ######################################################################
-# load/install distribute
+# load/install setuptools
 
 to_reload = False
 try:
-    import pkg_resources, setuptools
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        raise ImportError
+    import pkg_resources
+    import setuptools
 except ImportError:
     ez = {}
 
@@ -73,8 +75,10 @@
     except ImportError:
         from urllib2 import urlopen
 
-    exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
-    setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
+    # XXX use a more permanent ez_setup.py URL when available.
+    exec(urlopen('https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py'
+                ).read(), ez)
+    setup_args = dict(to_dir=tmpeggs, download_delay=0)
     ez['use_setuptools'](**setup_args)
 
     if to_reload:
@@ -89,7 +93,7 @@
 ######################################################################
 # Install buildout
 
-ws  = pkg_resources.working_set
+ws = pkg_resources.working_set
 
 cmd = [sys.executable, '-c',
        'from setuptools.command.easy_install import main; main()',
@@ -104,22 +108,23 @@
 if find_links:
     cmd.extend(['-f', find_links])
 
-distribute_path = ws.find(
-    pkg_resources.Requirement.parse('distribute')).location
+setuptools_path = ws.find(
+    pkg_resources.Requirement.parse('setuptools')).location
 
 requirement = 'zc.buildout'
 version = options.version
 if version is None and not options.accept_buildout_test_releases:
     # Figure out the most recent final version of zc.buildout.
     import setuptools.package_index
     _final_parts = '*final-', '*final'
+
     def _final_version(parsed_version):
         for part in parsed_version:
             if (part[:1] == '*') and (part not in _final_parts):
                 return False
         return True
     index = setuptools.package_index.PackageIndex(
-        search_path=[distribute_path])
+        search_path=[setuptools_path])
     if find_links:
         index.add_find_links((find_links,))
     req = pkg_resources.Requirement.parse(requirement)
@@ -142,7 +147,7 @@ def _final_version(parsed_version):
 cmd.append(requirement)
 
 import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
     raise Exception(
         "Failed to execute command:\n%s",
         repr(cmd)[1:-1])

buildout.cfg

@@ -59,9 +59,10 @@ output = erppeek.ini
 
 [versions]
 argparse = 1.2.1
-behave = 1.2.2
+behave = 1.2.3
 ERPpeek = 1.4.5
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.7
+importlib = 1.0.2
 mock = 1.0.1
-parse = 1.6.1
+parse = 1.6.2
 unittest2 = 0.5.1

etc/buildout-pinned.cfg

@@ -7,41 +7,42 @@ collective.recipe.supervisor = 0.19
 gf.recipe.bzr = 1.0rc8
 meld3 = 0.6.10
 ; superlance = 0.7
-supervisor = 3.0b1
+supervisor = 3.0b2
 z3c.recipe.template = 0.1
-zc.buildout = 2.1.0
-zc.recipe.egg = 2.0.0a3
+zc.buildout = 2.2.0
+zc.recipe.egg = 2.0.0
 
 ; OpenERP
 Babel = 0.9.6
-distribute = 0.6.35
 feedparser = 5.1.3
-gdata = 2.0.17
-lxml = 3.1.0
-Mako = 0.7.3
-MarkupSafe = 0.15
-Pillow = 1.7.8
-psycopg2 = 2.4.6
+gdata = 2.0.18
+lxml = 3.2.1
+Mako = 0.8.1
+MarkupSafe = 0.18
+Pillow = 2.1.0
+psycopg2 = 2.5.1
 PyChart = 1.39
 pydot = 1.0.28
 pyparsing = 1.5.7
 python-dateutil = 1.5
-python-ldap = 2.4.10
+python-ldap = 2.4.13
 python-openid = 2.2.5
 pytz = 2013b
 PyWebDAV = 0.9.8
 PyYAML = 3.10
-reportlab = 2.6
-simplejson = 3.1.2
-vatnumber = 1.0
+reportlab = 2.7
+simplejson = 3.3.0
+vatnumber = 1.1
 vobject = 0.8.1c
+; OpenERP 6.1 gives errors with Werkzeug >= 0.9
+; https://gist.github.com/florentx/5973595
 Werkzeug = 0.8.3
-xlwt = 0.7.4
+xlwt = 0.7.5
 
 ; OpenERP 7.0
 docutils = 0.10
-Jinja2 = 2.6
-psutil = 0.6.1
+Jinja2 = 2.7
+psutil = 0.7.1
 
 ; OpenERP 6.1
 PyXML = 0.8.4