From 5b18271976628af03de485e78699990f2b4ea02e Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Mon, 12 Jan 2015 14:47:44 +0100
Subject: [PATCH] Fixed bootstrap
---
MANIFEST.in | 5 +-
bootstrap.py => bootstrap-buildout.py | 91 ++++++++++++++-------------
2 files changed, 51 insertions(+), 45 deletions(-)
rename bootstrap.py => bootstrap-buildout.py (72%)
diff --git a/MANIFEST.in b/MANIFEST.in
index f3729ac..231f6f0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
-include LICENSE README.rst bootstrap.py buildout.cfg requirements.txt version.txt
+include LICENSE README.rst bootstrap-buildout.py buildout.cfg requirements.txt version.txt
recursive-include doc conf.py *.rst
-recursive-include bob *.cc *.cpp *.h *.hdf5
+recursive-include bob/learn/linear *.cpp *.h
+recursive-include bob/learn/linear/data *.*
diff --git a/bootstrap.py b/bootstrap-buildout.py
similarity index 72%
rename from bootstrap.py
rename to bootstrap-buildout.py
index 3995f07..a629566 100644
--- a/bootstrap.py
+++ b/bootstrap-buildout.py
@@ -56,6 +56,11 @@ parser.add_option("-c", "--config-file",
"file to be used."))
parser.add_option("-f", "--find-links",
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"))
+parser.add_option("--setuptools-version",
+ help="use a specific setuptools version")
options, args = parser.parse_args()
@@ -63,45 +68,42 @@ options, args = parser.parse_args()
######################################################################
# load/install setuptools
-to_reload = False
try:
- import pkg_resources
- import setuptools
+ if options.allow_site_packages:
+ import setuptools
+ import pkg_resources
+ from urllib.request import urlopen
except ImportError:
- ez = {}
-
- try:
- from urllib.request import urlopen
- except ImportError:
- from urllib2 import urlopen
-
- # 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:
- reload(pkg_resources)
- 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)
+ from urllib2 import urlopen
-######################################################################
-# Try to best guess the version of buildout given setuptools
-if options.version is None:
-
- try:
- from distutils.version import LooseVersion
- package = pkg_resources.require('setuptools')[0]
- v = LooseVersion(package.version)
- if v < LooseVersion('0.7'):
- options.version = '2.1.1'
- except:
- pass
+ez = {}
+exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
+
+if not options.allow_site_packages:
+ # ez_setup imports site, which adds site packages
+ # this will remove them from the path to ensure that incompatible versions
+ # of setuptools are not in the path
+ import site
+ # inside a virtualenv, there is no 'getsitepackages'.
+ # We can't remove these reliably
+ if hasattr(site, 'getsitepackages'):
+ for sitepackage_path in site.getsitepackages():
+ sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
+
+setup_args = dict(to_dir=tmpeggs, download_delay=0)
+
+if options.setuptools_version is not None:
+ setup_args['version'] = options.setuptools_version
+
+ez['use_setuptools'](**setup_args)
+import setuptools
+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)
######################################################################
# Install buildout
@@ -132,10 +134,15 @@ if version is None and not options.accept_buildout_test_releases:
_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
+ try:
+ return not parsed_version.is_prerelease
+ except AttributeError:
+ # Older setuptools
+ 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=[setuptools_path])
if find_links:
@@ -162,8 +169,7 @@ cmd.append(requirement)
import subprocess
if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
raise Exception(
- "Failed to execute command:\n%s",
- repr(cmd)[1:-1])
+ "Failed to execute command:\n%s" % repr(cmd)[1:-1])
######################################################################
# Import and run buildout
@@ -181,4 +187,3 @@ if options.config_file is not None:
zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
-
--
GitLab