Commit e209ee18 authored by Jim Fulton's avatar Jim Fulton

Merge branch 'master' of github.com:buildout/buildout

parents 1e9cc1eb 88ad9f41
......@@ -50,14 +50,15 @@ except ImportError:
exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
ez['use_setuptools'](to_dir='eggs', download_delay=0)
import pkg_resources
import pkg_resources, setuptools
setuptools_path = os.path.dirname(os.path.dirname(setuptools.__file__))
######################################################################
# Install buildout
if subprocess.call(
[sys.executable] +
['setup.py', '-q', 'develop', '-m', '-x', '-d', 'develop-eggs'],
env=dict(os.environ, PYTHONPATH=os.path.dirname(pkg_resources.__file__))):
env=dict(os.environ, PYTHONPATH=setuptools_path)):
raise RuntimeError("buildout build failed.")
pkg_resources.working_set.add_entry('src')
......
......@@ -13,13 +13,11 @@
##############################################################################
"""Install packages as eggs
"""
import logging
import os
import re
import sys
import zc.buildout.easy_install
import zipfile
logger = logging.getLogger(__name__)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment