Move trilinos tests to Py3k (#797)

* Move trilinos tests to Py3k * Manually install pytrilinos [Not available from conda-forge/fipy-feedstock, yet](conda-forge/fipy-feedstock#27)
usnistgov · Apr 20, 2021 · 25483df · 25483df
1 parent 26b0e91
commit 25483df
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -248,7 +248,7 @@ jobs:
 
     steps:
       - install_conda_packages:
-          packages: "python=3.6 fipy"
+          packages: "python=3 fipy pytrilinos"
           condaenv: "test-environment-36"
 
   pip_env:
@@ -286,54 +286,54 @@ jobs:
     environment:
       FIPY_SOLVERS: scipy
 
-  test-27-trilinos-serial:
+  test-27-petsc-serial:
     <<: *defaults2
 
     steps:
       - test_fipy:
           condaenv: test-environment-27
     environment:
-      FIPY_SOLVERS: trilinos
+      FIPY_SOLVERS: petsc
 
-  test-27-trilinos-parallel:
+  test-27-petsc-parallel:
     <<: *defaults2
 
     steps:
       - test_fipy:
           mpirun: "mpirun -np 2"
           condaenv: test-environment-27
     environment:
-      FIPY_SOLVERS: trilinos
+      FIPY_SOLVERS: petsc
       OMP_NUM_THREADS: 1
 
-  test-27-petsc-serial:
-    <<: *defaults2
+  test-36-scipy:
+    <<: *defaults3
 
     steps:
       - test_fipy:
-          condaenv: test-environment-27
+          condaenv: test-environment-36
     environment:
-      FIPY_SOLVERS: petsc
+      FIPY_SOLVERS: scipy
 
-  test-27-petsc-parallel:
-    <<: *defaults2
+  test-36-trilinos-serial:
+    <<: *defaults3
 
     steps:
       - test_fipy:
-          mpirun: "mpirun -np 2"
-          condaenv: test-environment-27
+          condaenv: test-environment-36
     environment:
-      FIPY_SOLVERS: petsc
-      OMP_NUM_THREADS: 1
+      FIPY_SOLVERS: trilinos
 
-  test-36-scipy:
+  test-36-trilinos-parallel:
     <<: *defaults3
 
     steps:
       - test_fipy:
+          mpirun: "mpirun -np 2"
           condaenv: test-environment-36
     environment:
-      FIPY_SOLVERS: scipy
+      FIPY_SOLVERS: trilinos
+      OMP_NUM_THREADS: 1
 
   test-36-petsc-serial:
     <<: *defaults3
@@ -618,12 +618,6 @@ workflows:
 #       - test-27-scipy:
 #           requires:
 #             - conda2_env
-      - test-27-trilinos-serial:
-          requires:
-            - conda2_env
-      - test-27-trilinos-parallel:
-          requires:
-            - conda2_env
       - test-27-petsc-serial:
           requires:
             - conda2_env
@@ -633,6 +627,12 @@ workflows:
       - test-36-scipy:
           requires:
             - conda3_env
+      - test-36-trilinos-serial:
+          requires:
+            - conda3_env
+      - test-36-trilinos-parallel:
+          requires:
+            - conda3_env
       - test-36-petsc-serial:
           requires:
             - conda3_env

diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,10 @@ env:
   - TRAVIS_PYTHON_VERSION=2.7 MPIRUN= FIPY_SOLVERS=pysparse
 #  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN= FIPY_SOLVERS=pysparse FIPY_INLINE=1
 #  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN= FIPY_SOLVERS=scipy
-  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN= FIPY_SOLVERS=trilinos
-  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN="mpirun -np 2" FIPY_SOLVERS=trilinos
-  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN= FIPY_SOLVERS=petsc
-  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN="mpirun -np 2" FIPY_SOLVERS=petsc
+  - TRAVIS_PYTHON_VERSION=3.6 MPIRUN= FIPY_SOLVERS=trilinos
+  - TRAVIS_PYTHON_VERSION=3.6 MPIRUN="mpirun -np 2" FIPY_SOLVERS=trilinos
+#  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN= FIPY_SOLVERS=petsc
+#  - TRAVIS_PYTHON_VERSION=2.7 MPIRUN="mpirun -np 2" FIPY_SOLVERS=petsc
   - TRAVIS_PYTHON_VERSION=3.6 MPIRUN= FIPY_SOLVERS=scipy
   - TRAVIS_PYTHON_VERSION=3.6 MPIRUN= FIPY_SOLVERS=petsc
   - TRAVIS_PYTHON_VERSION=3.6 MPIRUN="mpirun -np 2" FIPY_SOLVERS=petsc
@@ -45,7 +45,7 @@ before_install:
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
-  - conda create --quiet --name test-environment --show-channel-urls --channel conda-forge python=$TRAVIS_PYTHON_VERSION fipy gmsh;
+  - conda create --quiet --name test-environment --show-channel-urls --channel conda-forge python=$TRAVIS_PYTHON_VERSION fipy gmsh pytrilinos;
   - source activate test-environment
   - conda remove --quiet --channel conda-forge --force fipy
   - if [[ $PY3K -eq 0 ]]; then