Merge pull request #43 from geodynamics/baagaard/update-travisci-py27

Update Travis CI settings to use Python 2.7 compatible pythia and nemesis

Author: baagaard-usgs

.travis.yml

@@ -1,5 +1,7 @@
 # Travis-CI configuration
 
+dist: bionic
+
 services:
     - docker
 
@@ -10,48 +12,28 @@ jobs:
   include:
     - name: debian-stable-gcc8
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-debian-stable-gcc8 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
+      env: BASE_IMAGE=geodynamics/pylith-testenv-debian-stable-gcc8:py2 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
     - name: debian-testing-gcc9
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-debian-testing-gcc9 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
+      env: BASE_IMAGE=geodynamics/pylith-testenv-debian-testing-gcc9:py2 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
     - name: ubuntu-18.04
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-ubuntu-18.04 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
-    - name: ubuntu-19.10
-      os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-ubuntu-19.10 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
+      env: BASE_IMAGE=geodynamics/pylith-testenv-ubuntu-18.04:py2 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
     - name: ubuntu-20.04
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-ubuntu-20.04 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
-    - name: fedora-30
-      os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-fedora-30 TEST_COVERAGE=yes PYTHON_COVERAGE=coverage2
-    - name: fedora-31
-      os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-fedora-31 TEST_COVERAGE=yes PYTHON_COVERAGE=coverage2
+      env: BASE_IMAGE=geodynamics/pylith-testenv-ubuntu-20.04:py2 TEST_COVERAGE=yes PYTHON_COVERAGE=python2-coverage
     - name: fedora-32
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-fedora-32
-    - name: centos-6
+      env: BASE_IMAGE=geodynamics/pylith-testenv-fedora-32:py2
+    - name: fedora-33
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-centos-6
+      env: BASE_IMAGE=geodynamics/pylith-testenv-fedora-33:py2
     - name: centos-7
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-centos-7
+      env: BASE_IMAGE=geodynamics/pylith-testenv-centos-7:py2
     - name: centos-8
       os: linux
-      env: BASE_IMAGE=geodynamics/pylith-testenv-centos-8
-
-# Permissions problem with BUILD_DIR for nemesis.
-#    - name: fedora-33
-#      os: linux
-#      env: BASE_IMAGE=geodynamics/pylith-testenv-fedora-33
-
-#    - os: linux
-#      env: BASE_IMAGE=geodynamics/pylith-testenv-debian-testing-clang8
-#    - os: linux
-#      env: BASE_IMAGE=geodynamics/pylith-testenv-debian-testing-clang9
-
+      env: BASE_IMAGE=geodynamics/pylith-testenv-centos-8:py2
 
 addons:
   apt:

docker/spatialdata-testenv

@@ -23,7 +23,7 @@ ENV PYTHONPATH ${PYTHONPATH}:${PREFIX_DIR}/lib/python${PYTHON_VERSION}/site-pack
 ENV SRC_DIR ${TOP_DIR}/src/pythia
 RUN mkdir -p ${PREFIX_DIR}/lib/python${PYTHON_VERSION}/site-packages
 
-RUN git clone --depth 1 --recursive https://github.com/geodynamics/pythia.git ${SRC_DIR}
+RUN git clone --branch v0.8.1.20 --depth 1 --recursive https://github.com/geodynamics/pythia.git ${SRC_DIR}
 WORKDIR ${SRC_DIR}
 RUN python2 setup.py install --prefix=${PREFIX_DIR}
 
@@ -32,7 +32,7 @@ ENV SRC_DIR $TOP_DIR/src/nemesis
 ENV BUILD_DIR $TOP_DIR/build/nemesis
 RUN mkdir -p ${BUILD_DIR}
 
-RUN git clone --depth 1 --recursive https://github.com/geodynamics/nemesis.git ${SRC_DIR}
+RUN git clone --branch v1.1.1 --depth 1 --recursive https://github.com/geodynamics/nemesis.git ${SRC_DIR}
 WORKDIR ${SRC_DIR}
 RUN autoreconf --install --verbose
 WORKDIR ${BUILD_DIR}

m4

@@ -27,11 +27,11 @@ def validateFilename(value):
     Validate filename.
     """
     if 0 == len(value):
-        raise ValueError("Name of SimpleGridDB file must be specified.")
+        raise ValueError("Name of TimeHistoryDB file must be specified.")
     try:
         fin = open(value, "r")
     except IOError:
-        raise IOError("Spatial database file '{}' not found.".format(value))
+        raise IOError("Temporal database file '{}' not found.".format(value))
     return value