Updated conda build scripts and added new badge to readme

Author: domdfcoding

.ci/travis_build_conda.sh

@@ -4,25 +4,36 @@
 set -e -x
 
 if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
+  if [ -z "$TRAVIS_TAG" ]; then
 
+    python3 ./make_conda_recipe.py || exit 1
 
-  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 --output-folder conda/dist --skip-existing
 
-  # 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 info -a
-  
-  conda config --add channels domdfcoding || exit 1
-  
-  conda config --add channels conda-forge || exit 1
-  
-  conda build conda --output-folder conda/dist
+    for f in conda/dist/noarch/domdf_python_tools-*.tar.bz2; do
+      echo "$f"
+      conda install $f || exit 1
+      echo "Deploying to Anaconda.org..."
+      anaconda -t $ANACONDA_TOKEN upload $f || exit 1
+      echo "Successfully deployed to Anaconda.org."
+    done
 
+  else
+    echo "Deferring building conda package because this is not a tagged commit"
 else
   echo "Skipping building conda package because this is not the required runtime"
 fi

.ci/travis_deploy_conda.sh

@@ -5,13 +5,23 @@ 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 --output-folder conda/dist
 
   for f in conda/dist/noarch/domdf_python_tools-*.tar.bz2; do
     echo "$f"

.travis.yml

@@ -11,7 +11,7 @@ python:
 install:
   - sudo apt-get update
 
-  - pip install rst2txt 
+  - pip install rst2txt yolk3k 
   - 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

README.rst

@@ -2,9 +2,11 @@
 domdf_python_tools
 **********************
 
+.. start shields
+
 .. image:: https://img.shields.io/travis/com/domdfcoding/domdf_python_tools/master?logo=travis
     :target: https://travis-ci.com/domdfcoding/domdf_python_tools
-    :alt: Build Status
+    :alt: Travis Build Status
 .. image:: https://readthedocs.org/projects/domdf_python_tools/badge/?version=latest
     :target: https://domdf_python_tools.readthedocs.io/en/latest/?badge=latest
     :alt: Documentation Status
@@ -21,8 +23,12 @@ domdf_python_tools
     :target: https://coveralls.io/github/domdfcoding/domdf_python_tools?branch=master
     :alt: Coverage
 .. image:: https://img.shields.io/badge/License-LGPL%20v3-blue.svg
-    :alt: PyPI - License
+    :alt: License
     :target: https://github.com/domdfcoding/domdf_python_tools/blob/master/LICENSE
+.. image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools
+    :alt: GitHub top language
+
+.. end shields
 
 
 

lint_roller.sh

@@ -13,23 +13,23 @@ declare -a warnings=(
   E703 E711 E712 E713 E714 E721 W503 W504
   )
 
-if [ -z "$(git status --porcelain --untracked-files=no)" ] || [ $1 == "-f" ]; then
+if [ -z "$(git status --porcelain --untracked-files=no)" ] || [ "$1" == "-f" ]; then
   # Working directory clean
 
   for error in "${errors[@]}"
   do
     echo "Correcting $error"
     autopep8 --in-place --select "$error" -a --recursive domdf_python_tools/
-    flake8 --select "$error" domdf_python_tools/
+    >&2 flake8 --select "$error" domdf_python_tools/
     autopep8 --in-place --select "$error" -a --recursive tests/
-    flake8 --select "$error" tests/
+    >&2 flake8 --select "$error" tests/
 
   done
 
   for warning in "${warnings[@]}"; do
     echo "Searching for $warning"
-    flake8 --select "$warning" domdf_python_tools/
-    flake8 --select "$warning" tests/
+    >&2 flake8 --select "$warning" domdf_python_tools/
+    >&2 flake8 --select "$warning" tests/
   done
 
   exit 0