Fix issues with travis-ci and binstar upload of dev package.

.travis.yml

@@ -13,7 +13,7 @@ env:
     - secure: "T7qEO3BVXdEP3J4bqE8X882KrdGD4L0cwbAjX/SZMm8e8bG/qmv7XWkxIDp/HakR5GlGr3EBGQDJi5g2CbmFwHjxXMbZ4Y0a3dvoCvfdBNUpBZcjPSil2X976aEkTR1MAL8X7VjuY4lwogqO2WU7Kzm1QaFWjWEl1fV/zxHYN9w="
     - secure: "T7qEO3BVXdEP3J4bqE8X882KrdGD4L0cwbAjX/SZMm8e8bG/qmv7XWkxIDp/HakR5GlGr3EBGQDJi5g2CbmFwHjxXMbZ4Y0a3dvoCvfdBNUpBZcjPSil2X976aEkTR1MAL8X7VjuY4lwogqO2WU7Kzm1QaFWjWEl1fV/zxHYN9w="
 
 
 install:
 install:
-  - source devtools/ci/install.sh
+  - source devtools/travis-ci/install.sh
   - export PYTHONUNBUFFERED=true
   - export PYTHONUNBUFFERED=true
 
 
 script:
 script:
@@ -26,6 +26,5 @@ after_script:
 
 
 after_success:
 after_success:
   - echo "after_success"
   - echo "after_success"
-  # Upload conda dev package to binstar if all tests pass.
-  - bash devtools/ci/after_sucess.sh
+  - bash devtools/travis-ci/after_success.sh
 
 

devtools/ci/after_sucess.sh → devtools/travis-ci/after_success.sh

 #!/bin/bash
 #!/bin/bash
 
 
-echo $TRAVIS_PULL_REQUEST $TRAVIS_BRANCH
+echo "Travis pull request: $TRAVIS_PULL_REQUEST"
+echo "Travis branch: $TRAVIS_BRANCH"
 
 
 if [[ "$TRAVIS_PULL_REQUEST" == "true" ]]; then
 if [[ "$TRAVIS_PULL_REQUEST" == "true" ]]; then
     echo "This is a pull request. No deployment will be done."; exit 0
     echo "This is a pull request. No deployment will be done."; exit 0
@@ -12,11 +13,6 @@ if [[ "$TRAVIS_BRANCH" != "master" ]]; then
 fi
 fi
 
 
 
 
-if [[ "2.7 3.3" =~ "$python" ]]; then
-    conda install --yes binstar jinja2
-    binstar -t $BINSTAR_TOKEN upload --force -u omnia -p pdbfixer-dev $HOME/miniconda/conda-bld/*/pdbfixer-dev-*.tar.bz2
-fi
-
-if [[ "$python" != "2.7" ]]; then
-    echo "No deploy on PYTHON_VERSION=${python}"; exit 0
-fi
+# Deploy to binstar.
+conda install --yes anaconda-client jinja2
+binstar -t $BINSTAR_TOKEN upload --force -u omnia -p pdbfixer-dev $HOME/miniconda/conda-bld/*/pdbfixer-dev-*.tar.bz2

devtools/ci/install.sh → devtools/travis-ci/install.sh

@@ -13,4 +13,5 @@ export PATH=$HOME/miniconda/bin:$PATH
 
 
 conda update --yes conda
 conda update --yes conda
 conda config --add channels http://conda.binstar.org/omnia
 conda config --add channels http://conda.binstar.org/omnia
-conda install --yes conda-build jinja2 binstar pip
+conda install --yes conda-build jinja2 anaconda-client pip
+