Commit 97626984 authored by Tres Seaver's avatar Tres Seaver

Merge toumorokoshi-master.

parents d75ff41f 682dd5a6
...@@ -56,6 +56,9 @@ parser.add_option("-c", "--config-file", ...@@ -56,6 +56,9 @@ parser.add_option("-c", "--config-file",
"file to be used.")) "file to be used."))
parser.add_option("-f", "--find-links", parser.add_option("-f", "--find-links",
help=("Specify a URL to search for buildout releases")) help=("Specify a URL to search for buildout releases"))
parser.add_option("--allow-site-packages",
action="store_true", default=False,
help=("Let bootstrap.py use existing site packages"))
options, args = parser.parse_args() options, args = parser.parse_args()
...@@ -63,32 +66,38 @@ options, args = parser.parse_args() ...@@ -63,32 +66,38 @@ options, args = parser.parse_args()
###################################################################### ######################################################################
# load/install setuptools # load/install setuptools
to_reload = False
try: try:
import pkg_resources if options.allow_site_packages:
import setuptools import setuptools
import pkg_resources
from urllib.request import urlopen
except ImportError: except ImportError:
ez = {} from urllib2 import urlopen
try: ez = {}
from urllib.request import urlopen exec(urlopen('https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py'
except ImportError: ).read(), ez)
from urllib2 import urlopen if not options.allow_site_packages:
# ez_setup imports site, which adds site packages
exec(urlopen( # this will remove them from the path to ensure that incompatible versions
'https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py' # of setuptools are not in the path
).read(), ez) import site
setup_args = dict(to_dir=tmpeggs, download_delay=0) # inside a virtualenv, there is no 'getsitepackages'.
ez['use_setuptools'](**setup_args) # We can't remove these reliably
if hasattr(site, 'getsitepackages'):
if to_reload: for sitepackage_path in site.getsitepackages():
reload(pkg_resources) sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
import pkg_resources
# This does not (always?) update the default working set. We will setup_args = dict(to_dir=tmpeggs, download_delay=0)
# do it. ez['use_setuptools'](**setup_args)
for path in sys.path: import setuptools
if path not in pkg_resources.working_set.entries: import pkg_resources
pkg_resources.working_set.add_entry(path)
# 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)
###################################################################### ######################################################################
# Install buildout # Install buildout
......
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