Trialling new .travis.yml layout

Author: domdfcoding

.ci/travis_deploy_conda.sh

@@ -4,37 +4,42 @@
 set -e -x
 
 if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
-
-  python3 ./make_conda_recipe.py || exit 1
-
-  # Switch to miniconda
-  source "$HOME/miniconda/etc/profile.d/conda.sh"
-  hash -r
-  conda activate base
-  conda config --set always_yes yes --set changeps1 no
-  conda update -q conda
-  conda install conda-build
-  conda install anaconda-client
-  conda info -a
-
-  conda config --add channels domdfcoding || exit 1
-
-  conda config --add channels conda-forge || exit 1
-
-  conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing
-
-  for f in conda/dist/noarch/domdf_python_tools-*.tar.bz2; do
-    [ -e "$f" ] || continue
-    echo "$f"
-    conda install $f || exit 1
-    if [ -z "$TRAVIS_TAG" ]; then
-      echo "Skipping deploy because this is not a tagged commit"
-    else
-      echo "Deploying to Anaconda.org..."
-      anaconda -t $ANACONDA_TOKEN upload $f || exit 1
-      echo "Successfully deployed to Anaconda.org."
-    fi
-  done
+  if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_COMMIT_MESSAGE" == "Bump Version*" ]; then
+    echo "Deferring building conda package because this is release"
+  else
+
+    python3 ./make_conda_recipe.py || exit 1
+
+    # Switch to miniconda
+    source "$HOME/miniconda/etc/profile.d/conda.sh"
+    hash -r
+    conda activate base
+    conda config --set always_yes yes --set changeps1 no
+    conda update -q conda
+    conda install conda-build
+    conda install anaconda-client
+    conda info -a
+
+    conda config --add channels domdfcoding || exit 1
+
+    conda config --add channels conda-forge || exit 1
+
+    conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing
+
+    for f in conda/dist/noarch/domdf_python_tools-*.tar.bz2; do
+      [ -e "$f" ] || continue
+      echo "$f"
+      conda install $f || exit 1
+      if [ -z "$TRAVIS_TAG" ]; then
+        echo "Skipping deploy because this is not a tagged commit"
+      else
+        echo "Deploying to Anaconda.org..."
+        anaconda -t $ANACONDA_TOKEN upload $f || exit 1
+        echo "Successfully deployed to Anaconda.org."
+      fi
+    done
+
+  fi
 
 else
   echo "Skipping deploying conda package because this is not the required runtime"

.travis.yml

@@ -15,15 +15,12 @@ install:
   - pip install coveralls tox tox-travis
   - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
   - bash miniconda.sh -b -p $HOME/miniconda
-  - chmod +x .ci/travis_build_conda.sh
   - chmod +x .ci/travis_deploy_conda.sh
 
 script:
   - tox
 after_success:
   - coveralls
-  - chmod +x .ci/travis_build_conda.sh
-  - .ci/travis_build_conda.sh || travis_terminate 1;
 
 
 stages:
@@ -35,22 +32,24 @@ jobs:
   include:
     - stage: deploy_pypi
       python: "3.6"
-      on:
-        tags: true
-        repo: domdfcoding/domdf_python_tools
+      install: skip
+      script: skip
       deploy:
+        on:
+          tags: true
+          repo: domdfcoding/domdf_python_tools
         provider: pypi
-        script: skip
         user: "DomDF"
         password:
           secure: GQVX7JKDfUWcHQzjmZ8yadF4eIM/AUaXu/Zl8U2hwhB6NavbzUayvMXalT+pfgZ6NaWFMPZOETlxv5d+hf98Io/5HIV4i1KB98ze90KXpUU2Icz7IdxWDWGhc36Vkhb7hU0HUfXLu8WxcxQCJB3t7uIB9SO36dh/cMayW5YvBy3HhluaTvgLax4nOJYjN/FJCgs9kTCBYrjJzheS0pgj37bXZCrB06H0bsxgnbaAiL8FiG6tgJLABDLfqPhtJgVRhtdYeuqGv31/OV0vkj1zG6bExp9ENQ4/5L7FijLRznW+DnsRJt6BdTBtxNxK+v1ZccTdVJzTzhoUH/TbXdI+qtBeatTYz880du7TujKoxfFxGZ9+bSaYURaClMHn7/Ndj7ioj5f51jLf8+BCEk3cWEfUL7yeKF6RBWLww6cFKQ9yDNOiXgrsndz6Oh535LV28rKXS1qeGBppMAv09RmR/YfHu+XMp5yWa+vDwjmrQDH7qEkA3wYYMfMRnwi9+LrOHtS7IqFkgbAXZPmh3C0X1UEqD4cuARcyD9FRU2PAXM1tBprxEFi1L/sv4O8KRP+I3jXXsBHTmzbWWVqXiySGOlX6R9vOma35WS3mkllS/Oz7IyhUtONrwpaLHnuBLKMgi+RnsoEYgLx6KgSXVSQ0JUZq8cP2yewC8nx626w675w=
         distributions: "sdist bdist_wheel"
         skip_existing: true
     - stage: deploy_conda
       python: "3.6"
+      install: skip
+      script: skip
       deploy:
         on:
-          tags: true
           repo: domdfcoding/domdf_python_tools
         provider: script
         script: .ci/travis_deploy_conda.sh || travis_terminate 1;