summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile3
-rwxr-xr-xci/manylinux.sh2
-rw-r--r--tox_wheels.ini2
4 files changed, 4 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 3a9af66f..1b96396a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ dist
htmlcov
MANIFEST
setuptools-*.egg
-.tox*
+.tox
.noseids
.cache
.pytest_cache
diff --git a/Makefile b/Makefile
index 3524d6fd..449271a9 100644
--- a/Makefile
+++ b/Makefile
@@ -28,13 +28,12 @@ clean: clean_platform ## Remove artifacts of test execution, i
rm -rf tests/eggsrc/build tests/eggsrc/dist tests/eggsrc/*.egg-info
rm -f setuptools-*.egg distribute-*.egg distribute-*.tar.gz
rm -rf doc/_build doc/_spell doc/sample_html_beta
- rm -rf .tox_kits
rm -rf .cache .pytest_cache .hypothesis
rm -rf $$TMPDIR/coverage_test
-make -C tests/gold/html clean
sterile: clean ## Remove all non-controlled content, even if expensive.
- rm -rf .tox*
+ rm -rf .tox
-docker image rm -f quay.io/pypa/manylinux1_i686 quay.io/pypa/manylinux1_x86_64
diff --git a/ci/manylinux.sh b/ci/manylinux.sh
index 05d17948..99ea598e 100755
--- a/ci/manylinux.sh
+++ b/ci/manylinux.sh
@@ -44,7 +44,7 @@ elif [[ $action == "test" ]]; then
shift
export COVERAGE_COVERAGE=yes
fi
- TOXWORKDIR=.tox_linux "$TOXBIN/tox" "$@" || true
+ TOXWORKDIR=.tox/linux "$TOXBIN/tox" "$@" || true
cd ~
else
diff --git a/tox_wheels.ini b/tox_wheels.ini
index a4854605..92a1ddf4 100644
--- a/tox_wheels.ini
+++ b/tox_wheels.ini
@@ -3,7 +3,7 @@
[tox]
envlist = py{27,35,36,37,38,sys}
-toxworkdir = {toxinidir}/.tox_kits
+toxworkdir = {toxinidir}/.tox/wheels
[testenv]
deps =