fix AWS

openpathsampling · Oct 4, 2016 · 4b3ebe7 · 4b3ebe7
1 parent 50b789d
commit 4b3ebe7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,9 +22,9 @@ script:
   - conda info --envs
   - source activate test
   - conda install --yes jupyter nose nose-timer python-coveralls msmbuilder pyemma ipynbtest
-  # - source devtools/ci/git_hash.sh
-  # - source devtools/ci/nosetests.sh
-  # - source devtools/ci/ipythontests.sh
+  - source devtools/ci/git_hash.sh
+  - source devtools/ci/nosetests.sh
+  - source devtools/ci/ipythontests.sh
 
   # Upload new docs
   - bash -x devtools/ci/after_sucess.sh
@@ -41,7 +41,6 @@ env:
 # - python=3.5  CONDA_PY=35  CONDA_NPY=110
 
   global:
-#  - secure: "Ou9KukGxCOdNWvEpr+9YrWTlB0xezu1mNV1gXtFjJ0RDIvzPRGUkpU7AUAdKwn6fUcbzq5E1y6rU9aG/QQe9YZkRHhPo585ZzieTNa0UxsyINk7XuwxL7MpRZijHCHFBvRVNrXkIh3CtmXvZS2ksAa8+FuYiO/lBbOMZ0nNAJac="
   - secure: "NJvoSrLNd2ZR3HluJjEqI36gD5lsucwIvgnYjNmM4cwnnA77aLV9FRYTwlLRZn3XY9FL8KOzL5l0amNzMD7sQrf7bWwWv7iCUBddH549q9RSgiuOugtodYJ6VaXi76hk1rOgcJpDoCj9wTCIlMtWibPUzr1QHmdihfdM2iA2kkE="
   - secure: "l9NJkZDD0ALhkErUvhRrreLsrcWErd+CXpWv8dxHGtkjemNx6CwVtyL+a30jz/QwMANSZbKll/cPK5yJQvuwDaWxja6UPLLKVNGtma+CmwKcIC/wwTwbMoxcS62fyLJ3kS0qR8oCQz2nCPKiYyRGADtPLWVMZckY1SJfNYcKuCM="
 

diff --git a/devtools/ci/after_sucess.sh b/devtools/ci/after_sucess.sh
@@ -3,9 +3,9 @@ if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
     echo "This is a pull request. No deployment will be done."; exit 0
 fi
 
-#if [[ "$TRAVIS_BRANCH" != "master" ]]; then
-#    echo "No deployment on BRANCH='$TRAVIS_BRANCH'"; exit 0
-#fi
+if [[ "$TRAVIS_BRANCH" != "master" ]]; then
+    echo "No deployment on BRANCH='$TRAVIS_BRANCH'"; exit 0
+fi
 
 PACKAGE_NAME=openpathsampling-dev
 GROUP_NAME=omnia