Skip to content

Commit 0f2ae83

Browse files
leifjleifj
committed
Merge pull request #72 from pmeulen/tests_fixes
./setup.py test fails with "AttributeError: Distribution instance has no attribute 'pbr'"
2 parents 63ac90b + fc48626 commit 0f2ae83

File tree

2 files changed

+175
-75
lines changed

2 files changed

+175
-75
lines changed

Diff for: ‎bootstrap.py

+174-74
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# #############################################################################
1+
##############################################################################
22
#
3-
# Copyright (c) 2006 Zope Corporation and Contributors.
3+
# Copyright (c) 2006 Zope Foundation and Contributors.
44
# All Rights Reserved.
55
#
66
# This software is subject to the provisions of the Zope Public License,
@@ -10,101 +10,201 @@
1010
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
1111
# FOR A PARTICULAR PURPOSE.
1212
#
13-
# #############################################################################
13+
##############################################################################
1414
"""Bootstrap a buildout-based project
1515
1616
Simply run this script in a directory containing a buildout.cfg.
1717
The script accepts buildout command-line options, so you can
1818
use the -c option to specify an alternate configuration file.
19-
20-
$Id: bootstrap.py 102545 2009-08-06 14:49:47Z chrisw $
2119
"""
2220

23-
import os, shutil, sys, tempfile, urllib2
24-
from optparse import OptionParser
25-
26-
tmpeggs = tempfile.mkdtemp()
21+
import os
22+
import shutil
23+
import sys
24+
import tempfile
2725

28-
is_jython = sys.platform.startswith('java')
26+
from optparse import OptionParser
2927

30-
# parsing arguments
31-
parser = OptionParser()
32-
parser.add_option("-v", "--version", dest="version",
33-
help="use a specific zc.buildout version")
34-
parser.add_option("-d", "--distribute",
35-
action="store_true", dest="distribute", default=True,
36-
help="Use Disribute rather than Setuptools.")
28+
__version__ = '2015-07-01'
29+
# See zc.buildout's changelog if this version is up to date.
30+
31+
tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
32+
33+
usage = '''\
34+
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
35+
36+
Bootstraps a buildout-based project.
37+
38+
Simply run this script in a directory containing a buildout.cfg, using the
39+
Python that you want bin/buildout to use.
40+
41+
Note that by using --find-links to point to local resources, you can keep
42+
this script from going over the network.
43+
'''
44+
45+
parser = OptionParser(usage=usage)
46+
parser.add_option("--version",
47+
action="store_true", default=False,
48+
help=("Return bootstrap.py version."))
49+
parser.add_option("-t", "--accept-buildout-test-releases",
50+
dest='accept_buildout_test_releases',
51+
action="store_true", default=False,
52+
help=("Normally, if you do not specify a --version, the "
53+
"bootstrap script and buildout gets the newest "
54+
"*final* versions of zc.buildout and its recipes and "
55+
"extensions for you. If you use this flag, "
56+
"bootstrap and buildout will get the newest releases "
57+
"even if they are alphas or betas."))
58+
parser.add_option("-c", "--config-file",
59+
help=("Specify the path to the buildout configuration "
60+
"file to be used."))
61+
parser.add_option("-f", "--find-links",
62+
help=("Specify a URL to search for buildout releases"))
63+
parser.add_option("--allow-site-packages",
64+
action="store_true", default=False,
65+
help=("Let bootstrap.py use existing site packages"))
66+
parser.add_option("--buildout-version",
67+
help="Use a specific zc.buildout version")
68+
parser.add_option("--setuptools-version",
69+
help="Use a specific setuptools version")
70+
parser.add_option("--setuptools-to-dir",
71+
help=("Allow for re-use of existing directory of "
72+
"setuptools versions"))
3773

3874
options, args = parser.parse_args()
75+
if options.version:
76+
print("bootstrap.py version %s" % __version__)
77+
sys.exit(0)
3978

40-
if options.version is not None:
41-
VERSION = '==%s' % options.version
42-
else:
43-
VERSION = ''
4479

45-
USE_DISTRIBUTE = options.distribute
46-
args = args + ['bootstrap']
80+
######################################################################
81+
# load/install setuptools
4782

48-
to_reload = False
4983
try:
50-
import pkg_resources
51-
52-
if not hasattr(pkg_resources, '_distribute'):
53-
to_reload = True
54-
raise ImportError
84+
from urllib.request import urlopen
5585
except ImportError:
56-
ez = {}
57-
if USE_DISTRIBUTE:
58-
exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py').read() in ez
59-
ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
60-
else:
61-
exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py').read() in ez
62-
ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
63-
64-
if to_reload:
65-
reload(pkg_resources)
66-
else:
67-
import pkg_resources
68-
69-
if sys.platform == 'win32':
70-
def quote(c):
71-
if ' ' in c:
72-
return '"%s"' % c # work around spawn lamosity on windows
73-
else:
74-
return c
75-
else:
76-
def quote(c):
77-
return c
86+
from urllib2 import urlopen
7887

79-
cmd = 'from setuptools.command.easy_install import main; main()'
80-
ws = pkg_resources.working_set
81-
82-
if USE_DISTRIBUTE:
83-
requirement = 'distribute'
88+
ez = {}
89+
if os.path.exists('ez_setup.py'):
90+
exec(open('ez_setup.py').read(), ez)
8491
else:
85-
requirement = 'setuptools'
92+
exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
93+
94+
if not options.allow_site_packages:
95+
# ez_setup imports site, which adds site packages
96+
# this will remove them from the path to ensure that incompatible versions
97+
# of setuptools are not in the path
98+
import site
99+
# inside a virtualenv, there is no 'getsitepackages'.
100+
# We can't remove these reliably
101+
if hasattr(site, 'getsitepackages'):
102+
for sitepackage_path in site.getsitepackages():
103+
# Strip all site-packages directories from sys.path that
104+
# are not sys.prefix; this is because on Windows
105+
# sys.prefix is a site-package directory.
106+
if sitepackage_path != sys.prefix:
107+
sys.path[:] = [x for x in sys.path
108+
if sitepackage_path not in x]
109+
110+
setup_args = dict(to_dir=tmpeggs, download_delay=0)
111+
112+
if options.setuptools_version is not None:
113+
setup_args['version'] = options.setuptools_version
114+
if options.setuptools_to_dir is not None:
115+
setup_args['to_dir'] = options.setuptools_to_dir
116+
117+
ez['use_setuptools'](**setup_args)
118+
import setuptools
119+
import pkg_resources
120+
121+
# This does not (always?) update the default working set. We will
122+
# do it.
123+
for path in sys.path:
124+
if path not in pkg_resources.working_set.entries:
125+
pkg_resources.working_set.add_entry(path)
126+
127+
######################################################################
128+
# Install buildout
86129

87-
if is_jython:
88-
import subprocess
130+
ws = pkg_resources.working_set
89131

90-
assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
91-
quote(tmpeggs), 'zc.buildout' + VERSION],
92-
env=dict(os.environ,
93-
PYTHONPATH=
94-
ws.find(pkg_resources.Requirement.parse(requirement)).location),
95-
).wait() == 0
96-
97-
else:
98-
assert os.spawnle(
99-
os.P_WAIT, sys.executable, quote(sys.executable),
100-
'-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout' + VERSION,
101-
dict(os.environ,
102-
PYTHONPATH=ws.find(pkg_resources.Requirement.parse(requirement)).location),
103-
) == 0
132+
setuptools_path = ws.find(
133+
pkg_resources.Requirement.parse('setuptools')).location
134+
135+
# Fix sys.path here as easy_install.pth added before PYTHONPATH
136+
cmd = [sys.executable, '-c',
137+
'import sys; sys.path[0:0] = [%r]; ' % setuptools_path +
138+
'from setuptools.command.easy_install import main; main()',
139+
'-mZqNxd', tmpeggs]
140+
141+
find_links = os.environ.get(
142+
'bootstrap-testing-find-links',
143+
options.find_links or
144+
('http://downloads.buildout.org/'
145+
if options.accept_buildout_test_releases else None)
146+
)
147+
if find_links:
148+
cmd.extend(['-f', find_links])
149+
150+
requirement = 'zc.buildout'
151+
version = options.buildout_version
152+
if version is None and not options.accept_buildout_test_releases:
153+
# Figure out the most recent final version of zc.buildout.
154+
import setuptools.package_index
155+
_final_parts = '*final-', '*final'
156+
157+
def _final_version(parsed_version):
158+
try:
159+
return not parsed_version.is_prerelease
160+
except AttributeError:
161+
# Older setuptools
162+
for part in parsed_version:
163+
if (part[:1] == '*') and (part not in _final_parts):
164+
return False
165+
return True
166+
167+
index = setuptools.package_index.PackageIndex(
168+
search_path=[setuptools_path])
169+
if find_links:
170+
index.add_find_links((find_links,))
171+
req = pkg_resources.Requirement.parse(requirement)
172+
if index.obtain(req) is not None:
173+
best = []
174+
bestv = None
175+
for dist in index[req.project_name]:
176+
distv = dist.parsed_version
177+
if _final_version(distv):
178+
if bestv is None or distv > bestv:
179+
best = [dist]
180+
bestv = distv
181+
elif distv == bestv:
182+
best.append(dist)
183+
if best:
184+
best.sort()
185+
version = best[-1].version
186+
if version:
187+
requirement = '=='.join((requirement, version))
188+
cmd.append(requirement)
189+
190+
import subprocess
191+
if subprocess.call(cmd) != 0:
192+
raise Exception(
193+
"Failed to execute command:\n%s" % repr(cmd)[1:-1])
194+
195+
######################################################################
196+
# Import and run buildout
104197

105198
ws.add_entry(tmpeggs)
106-
ws.require('zc.buildout' + VERSION)
199+
ws.require(requirement)
107200
import zc.buildout.buildout
108201

202+
if not [a for a in args if '=' not in a]:
203+
args.append('bootstrap')
204+
205+
# if -c was provided, we push it back into args for buildout' main function
206+
if options.config_file is not None:
207+
args[0:0] = ['-c', options.config_file]
208+
109209
zc.buildout.buildout.main(args)
110210
shutil.rmtree(tmpeggs)

Diff for: ‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
url='http://blogs.mnt.se',
5252
license='BSD',
5353
setup_requires=['nose>=1.0'],
54-
tests_require=['nose>=1.0', 'mock', 'mako', 'mockredispy', 'testfixtures'],
54+
tests_require=['pbr==1.6', 'nose>=1.0', 'mock', 'mako', 'mockredispy', 'testfixtures'],
5555
test_suite="nose.collector",
5656
packages=find_packages('src'),
5757
package_dir={'': 'src'},

0 commit comments

Comments
 (0)