Commit 9796d8d3 authored by Godefroid Chapelle's avatar Godefroid Chapelle

Merge branch 'pin_setuptools_in_bootstrap' of github.com:buildout/buildout...

Merge branch 'pin_setuptools_in_bootstrap' of github.com:buildout/buildout into pin_setuptools_in_bootstrap
parents 8aea6b62 c53cda3d
......@@ -9,3 +9,4 @@ python*/
*.egg
*.egg-info
dist
.tox
......@@ -104,6 +104,7 @@ setup(
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Topic :: Software Development :: Build Tools',
'Topic :: Software Development :: Libraries :: Python Modules',
],
......
......@@ -3204,10 +3204,10 @@ def makeNewRelease(project, ws, dest, version='99.99'):
zip = zipfile.ZipFile(dest, 'a')
zip.writestr(
'EGG-INFO/PKG-INFO',
((zip.read('EGG-INFO/PKG-INFO').decode()
((zip.read('EGG-INFO/PKG-INFO').decode('ISO-8859-1')
).replace("Version: %s" % oldver,
"Version: %s" % version)
).encode()
).encode('ISO-8859-1')
)
zip.close()
else:
......
[tox]
envlist =
py26,py27,py32,py33
[testenv]
commands =
# buildout's dev.py wants python to not have setuptools
pip uninstall -y zc.buildout setuptools pip
python dev.py
{toxinidir}/bin/test -1 -v -c
# since we're removing setuptools we can't possibly reuse the virtualenv
recreate = true
# if the user has ccache installed, PATH may contain /usr/lib/ccache that has a
# gcc wrapper that fails to build anything when buildout's tests set HOME to a
# non-existent directory under /tmp
setenv =
PATH=/usr/bin:/bin
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