Updated files with git_helper

Author: domdfcoding

.ci/travis_build_conda.sh

@@ -22,7 +22,7 @@ if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
 
     conda config --add channels conda-forge || exit 1
 
-    conda build conda --output-folder conda/dist --skip-existing
+    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

.ci/travis_deploy_conda.sh

@@ -21,7 +21,7 @@ if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
 
   conda config --add channels conda-forge || exit 1
 
-  conda build conda --output-folder conda/dist
+  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
     echo "$f"

.travis.yml

@@ -20,6 +20,7 @@ script:
   - tox
 after_success:
   - coveralls
+  - chmod +x .ci/travis_build_conda.sh
   - .ci/travis_build_conda.sh || travis_terminate 1;
 
 deploy:
@@ -33,4 +34,5 @@ deploy:
   distributions: "sdist bdist_wheel"
   skip_existing: true
 after_deploy:
+  - chmod +x .ci/travis_deploy_conda.sh
   - .ci/travis_deploy_conda.sh || travis_terminate 1;

__pkginfo__.py

@@ -49,7 +49,7 @@
 conda_description = """Helpful functions for Python
 
 
-Before installing please ensure you have added the "conda-forge" channel. """
+Before installing please ensure you have added the following channels: domdfcoding, conda-forge"""
 install_requires = (repo_root / "requirements.txt").read_text().split('\n')
 extras_require = {'dates': ['pytz>=2019.1'], 'all': ['pytz>=2019.1']}
 

git_helper.yml

@@ -54,12 +54,7 @@ username: "domdfcoding"
 license: 'LGPLv3+'
 short_desc: 'Helpful functions for Python'
 
-conda_description: "Helpful functions for Python
-
-
-
-Before installing please ensure you have added the \"conda-forge\" channel.
-"
+conda_description: "Helpful functions for Python"
 
 classifiers:
   - 'Development Status :: 4 - Beta'

make_conda_recipe.py

@@ -27,7 +27,7 @@
 		all_requirements += requires
 
 all_requirements = set(x.replace(" ", '') for x in set(all_requirements))
-requirements_block = "\n".join(f"    - {req}" for req in all_requirements)
+requirements_block = "\n".join(f"    - {req}" for req in all_requirements if req)
 
 # txt_readme = publish_file(source=StringIO(long_description), writer=rst2txt.Writer())
 # description_block = "\n".join([line.replace('"', '\\"') for line in txt_readme.split("\n")])
@@ -82,7 +82,7 @@
 extra:
   maintainers:
     - {author}
-    - github.com/{{ username }}
+    - github.com/domdfcoding
 
 """)
 

tests/requirements.txt

@@ -1,4 +1,5 @@
-pytest >= 5.1.1
-pytest-cov >= 2.8.1
-pytz >= 2019.1
-coverage>=5.1
+coverage >=5.1
+pytest >=5.1.1
+pytest-cov >=2.8.1
+pytest-randomly
+pytz >=2019.1

tox.ini

@@ -20,11 +20,6 @@ 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