Cleanup

.travis.yml

@@ -3,7 +3,6 @@ language: python
 addons:
   apt:
     packages:
-      #- gromacs
       - doxygen
       - python-numpy
       - python-scipy
@@ -133,38 +132,21 @@ before_install:
       sudo pip install -U pytest --ignore-installed six;
     fi
   # The cmake version installed by apt on ARM and PPC is very old,
-  # so build a more recent version from source.
-  #- if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" || "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
-  #    sudo apt remove cmake;
-  #    pushd ${HOME};
-  #    wget https://github.com/Kitware/CMake/releases/download/v3.17.1/cmake-3.17.1.tar.gz;
-  #    tar xf cmake-3.17.1.tar.gz;
-  #    cd cmake-3.17.1;
-  #    ./bootstrap --prefix=${HOME}/cmake;
-  #    make -j 4;
-  #    make install;
-  #    export PATH=${HOME}/cmake/bin:${PATH};
-  #    popd;
-  #  fi
-  #- if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" ]]; then
-  #    sudo apt-get install libuv1 rhash libstdc++6;
-  #    wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-ppc64le/cmake-3.17.0-hfb1cb51_0.tar.bz2;
-  #    mkdir $HOME/cmake;
-  #    tar -xjvf cmake-3.17.0-hfb1cb51_0.tar.bz2 -C $HOME/cmake;
-  #    export PATH=$HOME/cmake/bin:$PATH;
-  #  fi
-  #- if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
-  #    sudo apt-get install libuv1 rhash libstdc++6;
-  #    wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-aarch64/cmake-3.17.0-h28c56e5_0.tar.bz2;
-  #    mkdir $HOME/cmake;
-  #    tar -xjvf cmake-3.17.0-h28c56e5_0.tar.bz2 -C $HOME/cmake;
-  #    export PATH=$HOME/cmake/bin:$PATH;
-  #  fi
-  #- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-  #    CMAKE_URL="http://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz";
-  #    mkdir $HOME/cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $HOME/cmake;
-  #    export PATH=${HOME}/cmake/bin:${PATH};
-  #  fi
+  # so download a newer version.
+  - if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" ]]; then
+      sudo apt-get install libuv1 rhash libstdc++6;
+      wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-ppc64le/cmake-3.17.0-hfb1cb51_0.tar.bz2;
+      mkdir $HOME/cmake;
+      tar -xjvf cmake-3.17.0-hfb1cb51_0.tar.bz2 -C $HOME/cmake;
+      export PATH=$HOME/cmake/bin:$PATH;
+    fi
+  - if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
+      sudo apt-get install libuv1 rhash libstdc++6;
+      wget https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-aarch64/cmake-3.17.0-h28c56e5_0.tar.bz2;
+      mkdir $HOME/cmake;
+      tar -xjvf cmake-3.17.0-h28c56e5_0.tar.bz2 -C $HOME/cmake;
+      export PATH=$HOME/cmake/bin:$PATH;
+    fi
   - if [[ "$OPENCL" == "true" ]]; then
       wget http://s3.amazonaws.com/omnia-ci/AMD-APP-SDKInstaller-v3.0.130.135-GA-linux64.tar.bz2;
       tar -xjf AMD-APP-SDK*.tar.bz2;
@@ -178,10 +160,8 @@ before_install:
       ${AMDAPPSDK}/bin/x86_64/clinfo;
       sudo apt-get install -y libgl1-mesa-dev;
     fi
-  # Install SWIG and Cython for Python wrappers. However, testing CUDA and
-  # OpenCL, we skip the Python wrapper for speed. We're not using anaconda
-  # python, but this is a fast way to get an apparently functional precompiled
-  # build of swig that's more modern than what's in apt.
+  # Install packages needed for Python: SWIG, Cython, and Gromacs (used by some tests).
+  # We do this differently on different platforms.  Possibly some of this could be unified.
   - if [[ "$OPENCL" == "false" && "$CUDA" == "false" && "$TRAVIS_OS_NAME" == "linux" && "${TRAVIS_CPU_ARCH}" != "ppc64le" && "${TRAVIS_CPU_ARCH}" != "arm64" ]]; then
       wget http://anaconda.org/omnia/swig/3.0.7/download/linux-64/swig-3.0.7-0.tar.bz2;
       mkdir $HOME/swig;