Merge b976156 into bd283da

.travis.yml

@@ -23,16 +23,14 @@ script:
   - source devtools/ci/nosetests.sh
   - source devtools/ci/ipythontests.sh
 
-  # Push to binstar anyway.
+  # Upload new docs
   - bash -x devtools/ci/after_sucess.sh
 
 env:
   matrix:
-# - python=2.6  CONDA_PY=26  CONDA_NPY=16
-# is 110 the correct numpy label? doesn't seem to cause problems....
     - python=2.7  CONDA_PY=27  CONDA_NPY=110
-# - python=3.3  CONDA_PY=33  CONDA_NPY=17
-# - python=3.4  CONDA_PY=34  CONDA_NPY=18
+# - python=3.4  CONDA_PY=34  CONDA_NPY=110
+# - python=3.5  CONDA_PY=35  CONDA_NPY=110
 
   global:
     # encrypted BINSTAR_TOKEN for push of dev package to binstar

devtools/ci/after_sucess.sh

@@ -1,5 +1,3 @@
-echo $TRAVIS_PULL_REQUEST $TRAVIS_BRANCH
-
 if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
     echo "This is a pull request. No deployment will be done."; exit 0
 fi
@@ -8,18 +6,18 @@ if [[ "$TRAVIS_BRANCH" != "master" ]]; then
     echo "No deployment on BRANCH='$TRAVIS_BRANCH'"; exit 0
 fi
 
-echo travis_fold:start:binstar.upload
-if [[ "2.7" =~ "$python" ]]; then
-    conda install --yes anaconda-client jinja2
-        conda convert -p all ~/miniconda2/conda-bld/linux-64/openpathsampling-dev*.tar.bz2 -o ~/miniconda2/conda-bld/
-    anaconda -t ${BINSTAR_TOKEN}  upload  --force -u omnia -p openpathsampling-dev $HOME/miniconda2/conda-bld/*/openpathsampling-dev*.tar.bz2
-fi
-
-if [[ "$python" != "2.7" ]]; then
-    echo "No deploy on PYTHON_VERSION=${python}"; exit 0
-fi
-
-echo travis_fold:end:binstar.upload
+#echo travis_fold:start:binstar.upload
+#if [[ "2.7" =~ "$python" ]]; then
+#    conda install --yes anaconda-client jinja2
+#        conda convert -p all ~/miniconda2/conda-bld/linux-64/openpathsampling-dev*.tar.bz2 -o ~/miniconda2/conda-bld/
+#    anaconda -t ${BINSTAR_TOKEN}  upload  --force -u omnia -p openpathsampling-dev $HOME/miniconda2/conda-bld/*/openpathsampling-dev*.tar.bz2
+#fi
+#
+#if [[ "$python" != "2.7" ]]; then
+#    echo "No deploy on PYTHON_VERSION=${python}"; exit 0
+#fi
+#
+#echo travis_fold:end:binstar.upload
 
 echo travis_fold:start:build.docs
 # Create the docs and push them to S3

devtools/ci/push-docs-to-s3.py

@@ -12,7 +12,7 @@
     PREFIX = openpathsampling.version.short_version
 
 if not any(d.project_name == 's3cmd' for d in pip.get_installed_distributions()):
-    raise ImportError('The s3cmd pacakge is required. try $ pip install s3cmd')
+    raise ImportError('The s3cmd package is required. try $ pip install s3cmd')
 # The secret key is available as a secure environment variable
 # on travis-ci to push the build documentation to Amazon S3.
 with tempfile.NamedTemporaryFile('w') as f: