Merge pull request #789 from arose/hainm-patch-2

add python 3.7 to travis test, drop 2.7
nglviewer · Apr 25, 2019 · 3a51ef3 · 3a51ef3
2 parents 455ed91 + 787c6c7
commit 3a51ef3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: cpp
 
 matrix:
   include:
-     - { os: linux, env: PYTHON_VERSION=2.7 }
+     - { os: linux, env: PYTHON_VERSION=3.7 }
      - { os: linux, env: PYTHON_VERSION=3.6 }
        # - { os: linux, env: PYTHON_VERSION=3.6 CONDA_BUILD=True} # turn on if ipywidgets=7 is built
      - { os: linux, env: PYTHON_VERSION=3.6 TESTJS=True}

diff --git a/conda-requirements-test.sh b/conda-requirements-test.sh
@@ -5,7 +5,7 @@
 conda install mdanalysis=0.16.2 -c conda-forge --yes
 conda install mdtraj=1.8.0 -c conda-forge --yes
 conda install rdkit -c rdkit --yes
-conda install simpletraj -c omnia --yes
+# conda install simpletraj -c omnia --yes # install via pip since simpletraj is not available in py3.7 yet.
 
 # > 100 MB
 # conda install ambertools=17 -c http://ambermd.org/downloads/ambertools/conda/ --yes
diff --git a/pip-requirements-test.txt b/pip-requirements-test.txt
@@ -13,6 +13,7 @@ parmed
 pytraj
 biopython
 pymatgen
+simpletraj
 
 # movie making
 matplotlib==2.0.2