Skip to content

Commit

Permalink
Merge branch 'tox-binary-name'
Browse files Browse the repository at this point in the history
  • Loading branch information
dcrosta committed May 3, 2022
2 parents 3d8e97d + 0462145 commit ab729a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ tox_version=$1
docker_version=$2

if [ "$tox_version" = "tox-4.x" ]; then
tox=tox4
mypy_target=mypy-tox4
else
tox=tox
mypy_target=mypy-tox3
fi

Expand All @@ -23,10 +21,10 @@ pip install --constraint $tox_version --constraint $docker_version .
pip show tox tox-docker docker

python tox_docker/tests/capture_containers_and_volumes.py .
$tox -e integration
tox -e integration
python tox_docker/tests/assert_containers_and_volumes_unchanged.py .

$tox -e $mypy_target
tox -e $mypy_target

echo "testing health check failure handling, an ERROR is expected:"
$tox -e healthcheck-failing 2>&1 | grep "'toxdocker/healthcheck' (from 'healthcheck-failing') failed health check"
tox -e healthcheck-failing 2>&1 | grep "'toxdocker/healthcheck' (from 'healthcheck-failing') failed health check"
2 changes: 1 addition & 1 deletion tox-4.x
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--pre tox>=4.0.0a10,<5.0
--pre tox>=4.0.0b2,<5.0

0 comments on commit ab729a5

Please sign in to comment.