on master help sign in
Merge pull request #456 from matejc/master

fix: update buildout

commitff5c13a23a395a26041e5cfc923ab6d5e93907fb authorAdam Tauber <asciimoo@gmail.com> dateTue 1 Dec 2015, 15:48 (11 years ago) parente98aef6d428922
4 files changed+120−195
Makefile+2−2 base.cfg−6 bootstrap.py+118−185 versions.cfg−2
Makefile+2−2
@@ -60,7 +60,7 @@ locales:
6060 @pybabel compile -d searx/translations
6161
6262clean:
63− @rm -rf .installed.cfg .mr.developer.cfg bin parts develop-eggs \
64− searx.egg-info lib include .coverage coverage searx/static/themes/default/css/*.css
63+ @rm -rf .installed.cfg .mr.developer.cfg bin parts develop-eggs eggs \
64+ searx.egg-info lib include .coverage coverage
6565
6666.PHONY: all tests robot flake8 coverage production minimal styles locales clean
base.cfg−6
@@ -1,16 +1,10 @@
11[buildout]
22extends = versions.cfg
3−versions = versions
43unzip = true
54newest = false
6−extends = versions.cfg
7−versions = versions
85prefer-final = true
96develop = .
107
11−extensions =
12− buildout_versions
13−
148eggs =
159 searx
1610
bootstrap.py+118−185
@@ -18,75 +18,17 @@ The script accepts buildout command-line options, so you can
1818use the -c option to specify an alternate configuration file.
1919"""
2020
21−import os, shutil, sys, tempfile, urllib, urllib2, subprocess
21+import os
22+import shutil
23+import sys
24+import tempfile
25+
2226from optparse import OptionParser
2327
24−if sys.platform == 'win32':
25− def quote(c):
26− if ' ' in c:
27− return '"%s"' % c # work around spawn lamosity on windows
28− else:
29− return c
30−else:
31− quote = str
32−
33−# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
34−stdout, stderr = subprocess.Popen(
35− [sys.executable, '-Sc',
36− 'try:\n'
37− ' import ConfigParser\n'
38− 'except ImportError:\n'
39− ' print 1\n'
40− 'else:\n'
41− ' print 0\n'],
42− stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
43−has_broken_dash_S = bool(int(stdout.strip()))
44−
45−# In order to be more robust in the face of system Pythons, we want to
46−# run without site-packages loaded. This is somewhat tricky, in
47−# particular because Python 2.6's distutils imports site, so starting
48−# with the -S flag is not sufficient. However, we'll start with that:
49−if not has_broken_dash_S and 'site' in sys.modules:
50− # We will restart with python -S.
51− args = sys.argv[:]
52− args[0:0] = [sys.executable, '-S']
53− args = map(quote, args)
54− os.execv(sys.executable, args)
55−# Now we are running with -S. We'll get the clean sys.path, import site
56−# because distutils will do it later, and then reset the path and clean
57−# out any namespace packages from site-packages that might have been
58−# loaded by .pth files.
59−clean_path = sys.path[:]
60−import site # imported because of its side effects
61−sys.path[:] = clean_path
62−for k, v in sys.modules.items():
63− if k in ('setuptools', 'pkg_resources') or (
64− hasattr(v, '__path__') and
65− len(v.__path__) == 1 and
66− not os.path.exists(os.path.join(v.__path__[0], '__init__.py'))):
67− # This is a namespace package. Remove it.
68− sys.modules.pop(k)
69−
70−is_jython = sys.platform.startswith('java')
71−
72−setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
73−distribute_source = 'http://python-distribute.org/distribute_setup.py'
74−distribute_source = 'https://bitbucket.org/pypa/setuptools/raw/f657df1f1ed46596d236376649c99a470662b4ba/distribute_setup.py'
75−
76−# parsing arguments
77−def normalize_to_url(option, opt_str, value, parser):
78− if value:
79− if '://' not in value: # It doesn't smell like a URL.
80− value = 'file://%s' % (
81− urllib.pathname2url(
82− os.path.abspath(os.path.expanduser(value))),)
83− if opt_str == '--download-base' and not value.endswith('/'):
84− # Download base needs a trailing slash to make the world happy.
85− value += '/'
86− else:
87− value = None
88− name = opt_str[2:].replace('-', '_')
89− setattr(parser.values, name, value)
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-')
9032
9133usage = '''\
9234[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -96,31 +38,14 @@ Bootstraps a buildout-based project.
9638Simply run this script in a directory containing a buildout.cfg, using the
9739Python that you want bin/buildout to use.
9840
99−Note that by using --setup-source and --download-base to point to
100−local resources, you can keep this script from going over the network.
41+Note that by using --find-links to point to local resources, you can keep
42+this script from going over the network.
10143'''
10244
10345parser = OptionParser(usage=usage)
104−parser.add_option("-v", "--version", dest="version",
105− help="use a specific zc.buildout version")
106−parser.add_option("-d", "--distribute",
107− action="store_true", dest="use_distribute", default=False,
108− help="Use Distribute rather than Setuptools.")
109−parser.add_option("--setup-source", action="callback", dest="setup_source",
110− callback=normalize_to_url, nargs=1, type="string",
111− help=("Specify a URL or file location for the setup file. "
112− "If you use Setuptools, this will default to " +
113− setuptools_source + "; if you use Distribute, this "
114− "will default to " + distribute_source + "."))
115−parser.add_option("--download-base", action="callback", dest="download_base",
116− callback=normalize_to_url, nargs=1, type="string",
117− help=("Specify a URL or directory for downloading "
118− "zc.buildout and either Setuptools or Distribute. "
119− "Defaults to PyPI."))
120−parser.add_option("--eggs",
121− help=("Specify a directory for storing eggs. Defaults to "
122− "a temporary directory that is deleted when the "
123− "bootstrap script completes."))
46+parser.add_option("--version",
47+ action="store_true", default=False,
48+ help=("Return bootstrap.py version."))
12449parser.add_option("-t", "--accept-buildout-test-releases",
12550 dest='accept_buildout_test_releases',
12651 action="store_true", default=False,
@@ -130,95 +55,117 @@ parser.add_option("-t", "--accept-buildout-test-releases",
13055 "extensions for you. If you use this flag, "
13156 "bootstrap and buildout will get the newest releases "
13257 "even if they are alphas or betas."))
133−parser.add_option("-c", None, action="store", dest="config_file",
134− help=("Specify the path to the buildout configuration "
135− "file to be used."))
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"))
13673
13774options, args = parser.parse_args()
75+if options.version:
76+ print("bootstrap.py version %s" % __version__)
77+ sys.exit(0)
13878
139−if options.eggs:
140− eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
141−else:
142− eggs_dir = tempfile.mkdtemp()
143−
144−if options.setup_source is None:
145− if options.use_distribute:
146− options.setup_source = distribute_source
147− else:
148− options.setup_source = setuptools_source
14979
150−if options.accept_buildout_test_releases:
151− args.insert(0, 'buildout:accept-buildout-test-releases=true')
80+######################################################################
81+# load/install setuptools
15282
15383try:
154− import pkg_resources
155− import setuptools # A flag. Sometimes pkg_resources is installed alone.
156− if not hasattr(pkg_resources, '_distribute'):
157− raise ImportError
84+ from urllib.request import urlopen
15885except ImportError:
159− ez_code = urllib2.urlopen(
160− options.setup_source).read().replace('\r\n', '\n')
161− ez = {}
162− exec ez_code in ez
163− setup_args = dict(to_dir=eggs_dir, download_delay=0)
164− if options.download_base:
165− setup_args['download_base'] = options.download_base
166− if options.use_distribute:
167− setup_args['no_fake'] = True
168− if sys.version_info[:2] == (2, 4):
169− setup_args['version'] = '0.6.32'
170− ez['use_setuptools'](**setup_args)
171− if 'pkg_resources' in sys.modules:
172− reload(sys.modules['pkg_resources'])
173− import pkg_resources
174− # This does not (always?) update the default working set. We will
175− # do it.
176− for path in sys.path:
177− if path not in pkg_resources.working_set.entries:
178− pkg_resources.working_set.add_entry(path)
179−
180−cmd = [quote(sys.executable),
181− '-c',
182− quote('from setuptools.command.easy_install import main; main()'),
183− '-mqNxd',
184− quote(eggs_dir)]
185−
186−if not has_broken_dash_S:
187− cmd.insert(1, '-S')
188−
189−find_links = options.download_base
190−if not find_links:
191− find_links = os.environ.get('bootstrap-testing-find-links')
192−if not find_links and options.accept_buildout_test_releases:
193− find_links = 'http://downloads.buildout.org/'
194−if find_links:
195− cmd.extend(['-f', quote(find_links)])
86+ from urllib2 import urlopen
19687
197−if options.use_distribute:
198− setup_requirement = 'distribute'
88+ez = {}
89+if os.path.exists('ez_setup.py'):
90+ exec(open('ez_setup.py').read(), ez)
19991else:
200− setup_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
129+
201130ws = pkg_resources.working_set
202−setup_requirement_path = ws.find(
203− pkg_resources.Requirement.parse(setup_requirement)).location
204−env = dict(
205− os.environ,
206− PYTHONPATH=setup_requirement_path)
131+
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])
207149
208150requirement = 'zc.buildout'
209−version = options.version
151+version = options.buildout_version
210152if version is None and not options.accept_buildout_test_releases:
211153 # Figure out the most recent final version of zc.buildout.
212154 import setuptools.package_index
213155 _final_parts = '*final-', '*final'
214156
215157 def _final_version(parsed_version):
216− for part in parsed_version:
217− if (part[:1] == '*') and (part not in _final_parts):
218− return False
219− return True
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+
220167 index = setuptools.package_index.PackageIndex(
221− search_path=[setup_requirement_path])
168+ search_path=[setuptools_path])
222169 if find_links:
223170 index.add_find_links((find_links,))
224171 req = pkg_resources.Requirement.parse(requirement)
@@ -227,8 +174,6 @@ if version is None and not options.accept_buildout_test_releases:
227174 bestv = None
228175 for dist in index[req.project_name]:
229176 distv = dist.parsed_version
230− if distv >= pkg_resources.parse_version('2dev'):
231− continue
232177 if _final_version(distv):
233178 if bestv is None or distv > bestv:
234179 best = [dist]
@@ -238,40 +183,28 @@ if version is None and not options.accept_buildout_test_releases:
238183 if best:
239184 best.sort()
240185 version = best[-1].version
241−
242186if version:
243− requirement += '=='+version
244−else:
245− requirement += '<2dev'
246−
187+ requirement = '=='.join((requirement, version))
247188cmd.append(requirement)
248189
249−if is_jython:
250− import subprocess
251− exitcode = subprocess.Popen(cmd, env=env).wait()
252−else: # Windows prefers this, apparently; otherwise we would prefer subprocess
253− exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
254−if exitcode != 0:
255− sys.stdout.flush()
256− sys.stderr.flush()
257− print ("An error occurred when trying to install zc.buildout. "
258− "Look above this message for any errors that "
259− "were output by easy_install.")
260− sys.exit(exitcode)
261−
262−ws.add_entry(eggs_dir)
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
197+
198+ws.add_entry(tmpeggs)
263199ws.require(requirement)
264200import zc.buildout.buildout
265201
266−# If there isn't already a command in the args, add bootstrap
267202if not [a for a in args if '=' not in a]:
268203 args.append('bootstrap')
269204
270−
271−# if -c was provided, we push it back into args for buildout's main function
205+# if -c was provided, we push it back into args for buildout' main function
272206if options.config_file is not None:
273207 args[0:0] = ['-c', options.config_file]
274208
275209zc.buildout.buildout.main(args)
276−if not options.eggs: # clean up temporary egg directory
277− shutil.rmtree(eggs_dir)
210+shutil.rmtree(tmpeggs)
versions.cfg−2
@@ -8,7 +8,6 @@ Pygments = 2.0.2
88WebOb = 1.4.1
99WebTest = 2.0.18
1010Werkzeug = 0.10.4
11−buildout-versions = 1.7
1211collective.recipe.omelette = 0.16
1312coverage = 3.7.1
1413decorator = 3.4.2
@@ -38,7 +37,6 @@ pyasn1 = 0.1.8
3837pyasn1-modules = 0.0.6
3938certifi = 2015.04.28
4039
41−#
4240cffi = 1.1.2
4341cryptography = 0.9.1
4442