Fix envs.

ionelmc · Jul 17, 2020 · ae27e46 · ae27e46
1 parent 01f6f6d
commit ae27e46
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -127,15 +127,6 @@ init:
   - ps: echo $env:TOXENV
   - ps: ls C:\Python*
 install:
-  - ps: |
-      Set-PSDebug -Trace 1
-      if ($Env:TOXENV.StartsWith("py38")) {
-        if ($Env:PYTHON_ARCH -eq "64") {
-          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON_HOME"
-        } else {
-          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON_HOME --x86"
-        }
-      }
   - '%PYTHON_HOME%\python -mpip install --progress-bar=off twine tox-wheel -rci/requirements.txt'
   - '%PYTHON_HOME%\Scripts\virtualenv --version'
   - '%PYTHON_HOME%\Scripts\easy_install --version'

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,9 @@ dist: xenial
 cache: false
 env:
   global:
+    - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
+    - LANG=en_US.UTF-8
     - TWINE_USERNAME=ionel
 matrix:
   include:
@@ -14,6 +16,7 @@ matrix:
       env:
         - TOXENV=docs
     - os: osx
+      osx_image: xcode11
       language: generic
       env:
         - TOXENV=py27-cover
@@ -26,6 +29,7 @@ matrix:
       python: '2.7'
       arch: arm64
     - os: osx
+      osx_image: xcode11
       language: generic
       env:
         - TOXENV=py27-nocov
@@ -79,10 +83,6 @@ matrix:
         - WHEEL_PATH=.tox/dist
       python: '3.6'
       arch: arm64
-    - os: osx
-      language: generic
-      env:
-        - TOXENV=py37-cover
     - env:
         - TOXENV=py37-cover,codecov,extension-coveralls,coveralls
       python: '3.7'
@@ -91,11 +91,6 @@ matrix:
         - TOXENV=py37-cover,codecov,extension-coveralls,coveralls
       python: '3.7'
       arch: arm64
-    - os: osx
-      language: generic
-      env:
-        - TOXENV=py37-nocov
-        - WHEEL_PATH=.tox/dist
     - env:
         - TOXENV=py37-nocov
         - WHEEL_MANYLINUX1=cp37
@@ -107,6 +102,11 @@ matrix:
         - WHEEL_PATH=.tox/dist
       python: '3.7'
       arch: arm64
+    - os: osx
+      osx_image: xcode11
+      language: generic
+      env:
+        - TOXENV=py38-cover
     - env:
         - TOXENV=py38-cover,codecov,extension-coveralls,coveralls
       python: '3.8'
@@ -115,6 +115,12 @@ matrix:
         - TOXENV=py38-cover,codecov,extension-coveralls,coveralls
       python: '3.8'
       arch: arm64
+    - os: osx
+      osx_image: xcode11
+      language: generic
+      env:
+        - TOXENV=py38-nocov
+        - WHEEL_PATH=.tox/dist
     - env:
         - TOXENV=py38-nocov
         - WHEEL_MANYLINUX1=cp38
@@ -188,8 +194,8 @@ script:
     fi
     )
 after_failure:
-  - travis_wait 15 more .tox/log/* | cat
-  - travis_wait 15 more .tox/*/log/* | cat
+  - more .tox/log/* | cat
+  - more .tox/*/log/* | cat
 notifications:
   email:
     on_success: never