simplify test matrix (#620)

* simplify test matrix

use focal for a builder
don't test different compilers (libsodium does that)
test system libsodium less (the permutations don't give better coverage)

* oops

* hey even simpler

* lame

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-python: 2.7
+dist: focal
 
 # Only build master, the version branches (e.g. 1.7.x), and
 # version tags (which are apparently considered branches by travis)
@@ -13,100 +13,42 @@ branches:
 matrix:
     include:
         - python: 2.7
-          env: TOXENV=py27 SODIUM_INSTALL=bundled CC=gcc
+          env: TOXENV=py27 SODIUM_INSTALL=bundled
         - python: 3.5
-          env: TOXENV=py35 SODIUM_INSTALL=bundled CC=gcc
+          env: TOXENV=py35 SODIUM_INSTALL=bundled
         - python: 3.6
-          env: TOXENV=py36 SODIUM_INSTALL=bundled CC=gcc
+          env: TOXENV=py36 SODIUM_INSTALL=bundled
         - python: 3.7
-          env: TOXENV=py37 SODIUM_INSTALL=bundled CC=gcc
-          dist: xenial
+          env: TOXENV=py37 SODIUM_INSTALL=bundled
         - python: 3.8
-          env: TOXENV=py38 SODIUM_INSTALL=bundled CC=gcc
-          dist: xenial
-        - env: TOXENV=pypy SODIUM_INSTALL=bundled CC=gcc
-        - python: 2.7
-          env: TOXENV=py27 SODIUM_INSTALL=system CC=gcc
-        - python: 3.5
-          env: TOXENV=py35 SODIUM_INSTALL=system CC=gcc
-        - python: 3.6
-          env: TOXENV=py36 SODIUM_INSTALL=system CC=gcc
-        - python: 3.7
-          env: TOXENV=py37 SODIUM_INSTALL=system CC=gcc
-          dist: xenial
+          env: TOXENV=py38 SODIUM_INSTALL=bundled
+        - python: pypy2.7-7.3.1
+          env: TOXENV=pypy SODIUM_INSTALL=bundled
         - python: 3.8
-          env: TOXENV=py38 SODIUM_INSTALL=system CC=gcc
-          dist: xenial
-        - env: TOXENV=pypy SODIUM_INSTALL=system CC=gcc
-        - python: 2.7
-          env: TOXENV=py27 SODIUM_INSTALL=bundled CC=clang
-        - python: 3.5
-          env: TOXENV=py35 SODIUM_INSTALL=bundled CC=clang
-        - python: 3.6
-          env: TOXENV=py36 SODIUM_INSTALL=bundled CC=clang
-        - python: 3.7
-          env: TOXENV=py37 SODIUM_INSTALL=bundled CC=clang
-          dist: xenial
+          env: TOXENV=py38 SODIUM_INSTALL=system
         - python: 3.8
-          env: TOXENV=py38 SODIUM_INSTALL=bundled CC=clang
-          dist: xenial
-        - env: TOXENV=pypy SODIUM_INSTALL=bundled CC=clang
-        - python: 2.7
-          env: TOXENV=py27 SODIUM_INSTALL=system CC=clang
-        - python: 3.5
-          env: TOXENV=py35 SODIUM_INSTALL=system CC=clang
-        - python: 3.6
-          env: TOXENV=py36 SODIUM_INSTALL=system CC=clang
-        - python: 3.7
-          env: TOXENV=py37 SODIUM_INSTALL=system CC=clang
-          dist: xenial
+          env: TOXENV=py38 SODIUM_INSTALL=bundled SODIUM_INSTALL_MINIMAL=1
         - python: 3.8
-          env: TOXENV=py38 SODIUM_INSTALL=system CC=clang
-          dist: xenial
-        - env: TOXENV=pypy SODIUM_INSTALL=system CC=clang
-        - python: 3.8
-          env: TOXENV=py38 SODIUM_INSTALL=bundled SODIUM_INSTALL_MINIMAL=1 CC=gcc
-          dist: xenial
-        - python: 3.6
           env: TOXENV=docs
         - python: 3.8
           env: TOXENV=meta
         - python: 2.7
           arch: arm64
-          env: TOXENV=py27 SODIUM_INSTALL=bundled CC=gcc
-        - python: 3.8
-          arch: arm64
-          env: TOXENV=py38 SODIUM_INSTALL=bundled CC=gcc
-          dist: xenial
-        - python: 2.7
-          arch: arm64
-          env: TOXENV=py27 SODIUM_INSTALL=system CC=gcc
-        - python: 3.8
-          arch: arm64
-          env: TOXENV=py38 SODIUM_INSTALL=system CC=gcc
+          env: TOXENV=py27 SODIUM_INSTALL=bundled
           dist: xenial
-        - python: 2.7
-          arch: arm64
-          env: TOXENV=py27 SODIUM_INSTALL=bundled CC=clang
         - python: 3.8
           arch: arm64
-          env: TOXENV=py38 SODIUM_INSTALL=bundled CC=clang
-          dist: xenial
-        - python: 2.7
-          arch: arm64
-          env: TOXENV=py27 SODIUM_INSTALL=system CC=clang
+          env: TOXENV=py38 SODIUM_INSTALL=bundled
         - python: 3.8
           arch: arm64
-          env: TOXENV=py38 SODIUM_INSTALL=system CC=clang
-          dist: xenial
+          env: TOXENV=py38 SODIUM_INSTALL=system
         - python: 3.8
           arch: arm64
-          env: TOXENV=py38 SODIUM_INSTALL=bundled SODIUM_INSTALL_MINIMAL=1 CC=gcc
-          dist: xenial
+          env: TOXENV=py38 SODIUM_INSTALL=bundled SODIUM_INSTALL_MINIMAL=1
 
 install: .travis/install.sh
 
-script: .travis/run.sh
+script: tox
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

.travis/install.sh

@@ -20,14 +20,3 @@ if [[ $SODIUM_INSTALL == 'system' ]]; then
 fi
 
 pip install -U tox coverage
-
-if [[ "${TOXENV}" == "pypy" ]]; then
-    rm -rf ~/.pyenv
-    git clone https://github.com/yyuu/pyenv.git ~/.pyenv
-    git -C  ~/.pyenv reset --hard ${PYENV_COMMIT:-HEAD}
-    PYENV_ROOT="$HOME/.pyenv"
-    PATH="$PYENV_ROOT/bin:$PATH"
-    eval "$(pyenv init -)"
-    pyenv install pypy-5.3.1
-    pyenv global pypy-5.3.1
-fi