--- a/bootstrap.py Thu Jun 04 15:48:20 2020 +0200
+++ b/bootstrap.py Thu Jun 04 15:50:16 2020 +0200
@@ -25,7 +25,10 @@
from optparse import OptionParser
-tmpeggs = tempfile.mkdtemp()
+__version__ = '2015-07-01'
+# See zc.buildout's changelog if this version is up to date.
+
+tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
usage = '''\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -35,18 +38,19 @@
Simply run this script in a directory containing a buildout.cfg, using the
Python that you want bin/buildout to use.
-Note that by using --find-links to point to local resources, you can keep
+Note that by using --find-links to point to local resources, you can keep
this script from going over the network.
'''
parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", help="use a specific zc.buildout version")
-
+parser.add_option("--version",
+ action="store_true", default=False,
+ help=("Return bootstrap.py version."))
parser.add_option("-t", "--accept-buildout-test-releases",
dest='accept_buildout_test_releases',
action="store_true", default=False,
- help=("Normally, if you do not specify a --version, the "
- "bootstrap script and buildout gets the newest "
+ help=("Normally, if you do not specify a --buildout-version, "
+ "the bootstrap script and buildout gets the newest "
"*final* versions of zc.buildout and its recipes and "
"extensions for you. If you use this flag, "
"bootstrap and buildout will get the newest releases "
@@ -59,36 +63,57 @@
parser.add_option("--allow-site-packages",
action="store_true", default=False,
help=("Let bootstrap.py use existing site packages"))
-
+parser.add_option("--buildout-version",
+ help="Use a specific zc.buildout version")
+parser.add_option("--setuptools-version",
+ help="Use a specific setuptools version")
+parser.add_option("--setuptools-to-dir",
+ help=("Allow for re-use of existing directory of "
+ "setuptools versions"))
options, args = parser.parse_args()
+if options.version:
+ print("bootstrap.py version %s" % __version__)
+ sys.exit(0)
+
######################################################################
# load/install setuptools
try:
- if options.allow_site_packages:
- import setuptools
- import pkg_resources
from urllib.request import urlopen
except ImportError:
from urllib2 import urlopen
ez = {}
-exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
+if os.path.exists('ez_setup.py'):
+ exec(open('ez_setup.py').read(), ez)
+else:
+ 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
+ # 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'.
+ # 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]
+ # Strip all site-packages directories from sys.path that
+ # are not sys.prefix; this is because on Windows
+ # sys.prefix is a site-package directory.
+ if sitepackage_path != sys.prefix:
+ 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
+if options.setuptools_to_dir is not None:
+ setup_args['to_dir'] = options.setuptools_to_dir
+
ez['use_setuptools'](**setup_args)
import setuptools
import pkg_resources
@@ -104,7 +129,12 @@
ws = pkg_resources.working_set
+setuptools_path = ws.find(
+ pkg_resources.Requirement.parse('setuptools')).location
+
+# Fix sys.path here as easy_install.pth added before PYTHONPATH
cmd = [sys.executable, '-c',
+ 'import sys; sys.path[0:0] = [%r]; ' % setuptools_path +
'from setuptools.command.easy_install import main; main()',
'-mZqNxd', tmpeggs]
@@ -117,21 +147,23 @@
if find_links:
cmd.extend(['-f', find_links])
-setuptools_path = ws.find(
- pkg_resources.Requirement.parse('setuptools')).location
-
requirement = 'zc.buildout'
-version = options.version
+version = options.buildout_version
if version is None and not options.accept_buildout_test_releases:
# Figure out the most recent final version of zc.buildout.
import setuptools.package_index
_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:
@@ -156,7 +188,7 @@
cmd.append(requirement)
import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
+if subprocess.call(cmd) != 0:
raise Exception(
"Failed to execute command:\n%s" % repr(cmd)[1:-1])
--- a/buildout.cfg Thu Jun 04 15:48:20 2020 +0200
+++ b/buildout.cfg Thu Jun 04 15:50:16 2020 +0200
@@ -1,5 +1,5 @@
[buildout]
-eggs-directory = /var/local/eggs
+eggs-directory = /var/local/env/ztfy/eggs
include-site-packages = false
extends = http://download.ztfy.org/webapp/ztfy.webapp.dev.cfg
versions = versions
@@ -8,7 +8,7 @@
src = src
develop = .
../ztfy.jqueryui
-parts = package i18n pyflakes pyflakesrun test
+parts = package i18n pyflakes test
[package]
recipe = zc.recipe.egg
@@ -40,4 +40,4 @@
eggs = ztfy.utils [test]
[versions]
-ztfy.utils = 0.4.15.1
+ztfy.utils = 0.4.16
--- a/docs/HISTORY.txt Thu Jun 04 15:48:20 2020 +0200
+++ b/docs/HISTORY.txt Thu Jun 04 15:50:16 2020 +0200
@@ -1,6 +1,10 @@
Changelog
=========
+0.4.16
+------
+ - added HTTP client option to disable SSL certificate verification
+
0.4.15.1
--------
- packaging mismatch! :-/
--- a/setup.py Thu Jun 04 15:48:20 2020 +0200
+++ b/setup.py Thu Jun 04 15:50:16 2020 +0200
@@ -25,7 +25,7 @@
README = os.path.join(DOCS, 'README.txt')
HISTORY = os.path.join(DOCS, 'HISTORY.txt')
-version = '0.4.15.1'
+version = '0.4.16'
long_description = open(README).read() + '\n\n' + open(HISTORY).read()
tests_require = [
--- a/src/ztfy.utils.egg-info/PKG-INFO Thu Jun 04 15:48:20 2020 +0200
+++ b/src/ztfy.utils.egg-info/PKG-INFO Thu Jun 04 15:50:16 2020 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: ztfy.utils
-Version: 0.4.15.1
+Version: 0.4.16
Summary: ZTFY utility functions and classes for Zope3
Home-page: http://www.ztfy.org
Author: Thierry Florac
@@ -41,6 +41,10 @@
Changelog
=========
+ 0.4.16
+ ------
+ - added HTTP client option to disable SSL certificate verification
+
0.4.15.1
--------
- packaging mismatch! :-/
@@ -212,3 +216,4 @@
Classifier: Programming Language :: Python
Classifier: Framework :: Zope3
Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Provides-Extra: test
--- a/src/ztfy.utils.egg-info/requires.txt Thu Jun 04 15:48:20 2020 +0200
+++ b/src/ztfy.utils.egg-info/requires.txt Thu Jun 04 15:50:16 2020 +0200
@@ -31,7 +31,7 @@
zope.tales
zope.traversing
zopyx.txng3.core
-ztfy.jqueryui >= 0.7.0
+ztfy.jqueryui>=0.7.0
[test]
-zope.testing
\ No newline at end of file
+zope.testing