Permalink
Browse files

Update buildout and components

  • Loading branch information...
1 parent 655a87e commit c9ca35b4b11f67627a69f963c84266f5ce513de7 @Fantomas42 committed Jul 26, 2013
Showing with 31 additions and 25 deletions.
  1. +23 −18 bootstrap.py
  2. +1 −0 docs/development/buildout.rst
  3. +7 −7 versions.cfg
View
@@ -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])
@@ -66,6 +66,7 @@ Follow these few command to start the development: ::
$ virtualenv --no-site-packages django-blog-zinnia
$ cd django-blog-zinnia
$ source ./bin/activate
+ $ pip install -U setuptools
$ python bootstrap.py
$ ./bin/buildout
View
@@ -2,12 +2,12 @@
# Django
Pillow = 2.0.0
pytz = 2013b
-South = 0.7.6
+South = 0.8.1
django = 1.5.1
# Zinnia main
pyparsing = 1.5.6
-beautifulsoup4 = 4.1.3
+beautifulsoup4 = 4.2.1
django-mptt = 0.5.5
django-xmlrpc = 0.1.5
django-tagging = 0.3.1
@@ -29,7 +29,7 @@ Sphinx = 1.1.3
docutils = 0.10
# Tests
-nose = 1.2.1
+nose = 1.3.0
blessings = 1.5
nose-sfd = 0.1
nose-progressive = 1.4.1
@@ -50,8 +50,8 @@ virtualenv = 1.8.4
python-termstyle = 0.1.10
# Kwalitee
-pep8 = 1.4.2
-pyflakes = 0.6.1
+pep8 = 1.4.6
+pyflakes = 0.7.3
# Coveralls
python-coveralls = 2.0.0
@@ -61,12 +61,12 @@ requests = 1.2.2
sh = 1.08
# Buildout
-zc.buildout = 2.1.0
+zc.buildout = 2.2.0
zc.recipe.egg = 2.0.0
distribute = 0.6.35
djangorecipe = 1.5
pbp.recipe.noserunner = 0.2.6
collective.recipe.patch = 0.2.2
collective.recipe.sphinxbuilder = 0.7.3
zope.dottedname = 3.4.6
-setuptools = 0.6c12dev-r88846
+setuptools = 0.9.8

0 comments on commit c9ca35b

Please sign in to comment.