Work around setuptools 18.6 regression

See
https://bitbucket.org/pypa/setuptools/issues/464/typeerror-in-install_wrapper_scripts

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/bootstrap b/bootstrap
index bc58352f03449fa54760313229bf341326363aa6..e1bc2058a2e7844042869ee0a18600810ac612fa 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -114,7 +114,7 @@ if [ -z "$NO_CLOBBER" ] || [ ! -e ./virtualenv ]; then
     ./virtualenv/bin/pip install --upgrade pip
 
     # work-around change in pip 1.5
-    ./virtualenv/bin/pip install setuptools --no-use-wheel --upgrade
+    ./virtualenv/bin/pip install 'setuptools<18.6' --no-use-wheel --upgrade
 fi
 
 ./virtualenv/bin/pip install --upgrade -r requirements.txt

diff --git a/setup.py b/setup.py
index 5128efa1b3fa5ead7a1c07bbbd8a83904914bb2c..4c178bdbacdd519a277d52c284464530a774b36e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ setup(
         'Topic :: System :: Distributed Computing',
         'Topic :: System :: Filesystems',
     ],
-    install_requires=['setuptools',
+    install_requires=['setuptools < 18.6',
                       'gevent == 0.13.6',  # 0.14 switches to libev, that means bootstrap needs to change too
                       'MySQL-python == 1.2.3',
                       'PyYAML',