Only enable tox-wheel when publishing its wheels.

ionelmc · Jun 3, 2019 · fca7584 · fca7584
1 parent a0cabd4
commit fca7584
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -195,14 +195,17 @@ install:
 test_script:
   - ps: |
       Set-PSDebug -Trace 1
-      cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd $Env:PYTHON_HOME\Scripts\tox
-      if ($LastExitCode -eq 0) {
-        if ($Env:WHEEL_PATH) {
+      if ($Env:WHEEL_PATH) {
+        cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd $Env:PYTHON_HOME\Scripts\tox --wheel
+        if ($LastExitCode -eq 0) {
           $ErrorActionPreference = "Stop"
           iex "$Env:PYTHON_HOME\Scripts\twine check $Env:WHEEL_PATH/*.whl"
           iex "$Env:PYTHON_HOME\Scripts\twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing $Env:WHEEL_PATH/*.whl"
         }
       } else {
+        cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd $Env:PYTHON_HOME\Scripts\tox
+      }
+      if ($LastExitCode -ne 0) {
         Get-ChildItem Env:
         Get-Content .tox\*\log\*
       }

diff --git a/.travis.yml b/.travis.yml
@@ -228,6 +228,8 @@ script:
     if [[ -n ${WHEEL_MANYLINUX1:-} ]]; then
       docker run --rm --user $UID -itv $(pwd):/code ionelmc/manylinux $WHEEL_MANYLINUX1
       tox --installpkg $WHEEL_PATH/*.whl -v
+    elif [[ -n ${WHEEL_PATH:-} ]]; then
+      tox -v --wheel
     else
       tox -v
     fi

diff --git a/ci/templates/.appveyor.yml b/ci/templates/.appveyor.yml
@@ -45,14 +45,17 @@ install:
 test_script:
   - ps: |
       Set-PSDebug -Trace 1
-      cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd $Env:PYTHON_HOME\Scripts\tox
-      if ($LastExitCode -eq 0) {
-        if ($Env:WHEEL_PATH) {
+      if ($Env:WHEEL_PATH) {
+        cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd $Env:PYTHON_HOME\Scripts\tox --wheel
+        if ($LastExitCode -eq 0) {
           $ErrorActionPreference = "Stop"
           iex "$Env:PYTHON_HOME\Scripts\twine check $Env:WHEEL_PATH/*.whl"
           iex "$Env:PYTHON_HOME\Scripts\twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing $Env:WHEEL_PATH/*.whl"
         }
       } else {
+        cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd $Env:PYTHON_HOME\Scripts\tox
+      }
+      if ($LastExitCode -ne 0) {
         Get-ChildItem Env:
         Get-Content .tox\*\log\*
       }

diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml
@@ -87,6 +87,8 @@ script:
     if [[ -n ${WHEEL_MANYLINUX1:-} ]]; then
       docker run --rm --user $UID -itv $(pwd):/code ionelmc/manylinux $WHEEL_MANYLINUX1
       tox --installpkg $WHEEL_PATH/*.whl -v
+    elif [[ -n ${WHEEL_PATH:-} ]]; then
+      tox -v --wheel
     else
       tox -v
     fi