Merge branch 'master' of git.vstconsulting.net:polemarch/ce into deve…

…loper

� Conflicts:
�	tox_build.ini

tox_build.ini

@@ -1,10 +1,11 @@
 [tox]
-# envlist = py35-build,py{35,36,37}-wheel
+# envlist = py35-build,py{35,36,37}-wheel,auditwheel
 envlist = py35-{build,wheel}
 skipsdist = True
 
 [testenv]
 passenv = *
+setenv = CCACHE_DIR = {envdir}/.ccache
 whitelist_externals =
     ls
     rm
@@ -13,9 +14,9 @@ whitelist_externals =
     mkdir
     make
 commands =
+    rm -rf build
     build: make compile PY=python {posargs}
     wheel: make wheel PY=python {posargs}
-    wheel: bash -c "for whl in `ls dist/*.whl | grep -v manylinux | grep -v none-any`; do auditwheel repair $whl -w dist/ && rm $whl; done"
     deb: make deb PY=python {posargs}
     rpm: make rpm PY=python {posargs}
 deps =
@@ -26,4 +27,15 @@ deps =
     csscompressor==0.9.5
     {rpm,deb}: virtualenv==16.0
     {rpm,deb}: venvctrl
-    py{35,36,37}-wheel: auditwheel
+
+[testenv:auditwheel]
+basepython = python3.6
+whitelist_externals =
+    bash
+    grep
+    rm
+    ls
+commands =
+    bash -c "for whl in `ls dist/*.whl | grep -v manylinux | grep -v none-any`; do auditwheel repair $whl -w dist/; rm $whl; done"
+deps =
+    auditwheel