Merge branch 'master' into pin_setuptools_in_bootstrap

.gitignore

@@ -9,3 +9,4 @@ python*/
 *.egg
 *.egg-info
 dist
+.tox

setup.py

@@ -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',
        ],

src/zc/buildout/tests.py

@@ -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.ini

+[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