Updated config files using git_helper

Author: domdfcoding

.ci/travis_build_conda.sh

@@ -15,7 +15,6 @@ if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
   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
@@ -24,22 +23,6 @@ if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
 
   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
-    if [ -z "$TRAVIS_TAG" ]; then
-      echo "Skipping deploy because this is not a tagged commit"
-    else
-      if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
-        echo "Deploying to Anaconda.org..."
-        anaconda -t $ANACONDA_TOKEN upload $f || exit 1
-        echo "Successfully deployed to Anaconda.org."
-      else
-          echo "Skipping deploy because this is not the required runtime"
-      fi
-    fi
-  done
-
 else
   echo "Skipping building conda package because this is not the required runtime"
 fi

.ci/travis_deploy_conda.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# This file is managed by `git_helper`. Don't edit it directly
+
+set -e -x
+
+if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
+
+  # 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 install anaconda-client
+  conda info -a
+
+  for f in conda/dist/noarch/domdf_python_tools-*.tar.bz2; do
+    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
+
+else
+  echo "Skipping deploying conda package because this is not the required runtime"
+fi
+
+exit 0

.readthedocs.yml

@@ -21,4 +21,4 @@ python:
   install:
     - requirements: requirements.txt
     - requirements: doc-source/requirements.txt
-  
+

.travis.yml

@@ -20,6 +20,9 @@ script:
   - tox
 after_success:
   - coveralls
+
+before_deploy:
+  - .ci/travis_build_conda.sh || travis_terminate 1;
 deploy:
   provider: pypi
   user: "DomDF"
@@ -31,4 +34,4 @@ deploy:
   distributions: "sdist bdist_wheel"
   skip_existing: true
 after_deploy:
-  - .ci/travis_build_conda.sh || travis_terminate 1;
+  - .ci/travis_deploy_conda.sh || travis_terminate 1;

__pkginfo__.py

@@ -25,7 +25,7 @@
 VERSION = "0.3.1"
 
 modname = "domdf_python_tools"
-py_modules = None
+py_modules = []
 entry_points = None
 
 license = 'LGPLv3+'
@@ -51,7 +51,7 @@
 
 Before installing please ensure you have added the "conda-forge" channel. """
 install_requires = (repo_root / "requirements.txt").read_text().split('\n')
-extras_require = {'dates': ['pytz>=2019.1']}
+extras_require = {'dates': ['pytz>=2019.1'], 'all': ['pytz>=2019.1']}
 
 classifiers = [
 		'Development Status :: 4 - Beta',
@@ -68,3 +68,5 @@
 		'Topic :: Software Development :: Libraries :: Python Modules',
 
 		]
+
+keywords = ""

lint_roller.sh

@@ -0,0 +1,45 @@
+# fix these
+declare -a errors=(
+  E301 E302 E303 E304 E305 E306 E502 E265
+  W291 W292 W293 W391 E226 E225
+  )
+
+# Only warn for these
+declare -a warnings=(
+  E101 E111 E112 E113 E121 E122 E123 E124 E125
+  E127 E128 E129 E131 E133 E201 E202 E203
+  E211 E222 E223 E224 E225 E227 E228 E231
+  E241 E242 E251 E261 E262 E271 E272 E402
+  E703 E711 E712 E713 E714 E721 E722 W503 W504
+  )
+
+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/
+    autopep8 --in-place --select "$error" -a --recursive tests/
+    flake8 --select "$error" tests/
+
+  done
+
+  for warning in "${warnings[@]}"; do
+    echo "Searching for $warning"
+    flake8 --select "$warning" domdf_python_tools/
+    flake8 --select "$warning" tests/
+  done
+
+  exit 0
+
+else
+  # Uncommitted changes
+  >&2 echo "git working directory is not clean"
+  exit 1
+
+fi
+
+
+

make_conda_recipe.py

@@ -1,5 +1,7 @@
 #!/usr/bin/python3
 
+# This file is managed by `git_helper`. Don't edit it directly
+
 import platform
 import rst2txt
 import sys

setup.py

@@ -18,11 +18,12 @@
 		license=license,
 		long_description=long_description,
 		name=modname,
-		packages=find_packages(exclude=("tests",)),
+		packages=find_packages(exclude=("tests", "doc-source")),
 		project_urls=project_urls,
 		py_modules=py_modules,
 		python_requires=">=3.6",
 		url=web,
 		version=VERSION,
+		keywords=keywords,
 
 		)

tox.ini

@@ -20,6 +20,13 @@ build-backend = "setuptools"
 description = pytest
 # Install test requirements
 deps = -r{toxinidir}/tests/requirements.txt
+       pytest >= 5.1.1
+       pytest-cov >= 2.8.1
+       pytz >= 2019.1
+       coverage>=5.1
+       pytest-randomly
+
+
 
 commands =
     python --version