Updated files with git_helper and trialling new .travis.yml layout

Author: domdfcoding

.bumpversion.cfg

@@ -10,3 +10,4 @@ tag = True
 [bumpversion:file:domdf_python_tools/__init__.py]
 
 [bumpversion:file:README.rst]
+

.ci/travis_deploy_conda.sh

@@ -24,6 +24,7 @@ if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
   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

.travis.yml

@@ -23,16 +23,27 @@ after_success:
   - chmod +x .ci/travis_build_conda.sh
   - .ci/travis_build_conda.sh || travis_terminate 1;
 
-deploy:
-  provider: pypi
-  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=
-  on:
-    tags: true
-    python: "3.6"
-  distributions: "sdist bdist_wheel"
-  skip_existing: true
+
+stages:
+  - test
+  - deploy
+
+jobs:
+  include:
+    - stage: deploy
+      provider: pypi
+      python: "3.6"
+      on:
+        tags: true
+        repo: domdfcoding/domdf_python_tools
+      deploy:
+        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
+
 after_deploy:
   - chmod +x .ci/travis_deploy_conda.sh
   - .ci/travis_deploy_conda.sh || travis_terminate 1;

__pkginfo__.py

@@ -22,6 +22,7 @@
 		"__copyright__",
 		"__version__",
 		"modname",
+		"pypi_name",
 		"py_modules",
 		"entry_points",
 		"__license__",
@@ -38,6 +39,7 @@
 		"extras_require",
 		"classifiers",
 		"keywords",
+		"import_name",
 		]
 
 __copyright__ = """
@@ -47,14 +49,18 @@
 __version__ = "0.3.1"
 
 modname = "domdf_python_tools"
+pypi_name = "domdf_python_tools"
+import_name = "domdf_python_tools"
 py_modules = []
-entry_points = None
+entry_points = {
+		"console_scripts": []
+		}
 
 __license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)"
 
 short_desc = "Helpful functions for Python"
 
-author = "Dominic Davis-Foster"
+__author__ = author = "Dominic Davis-Foster"
 author_email = "[email protected]"
 github_username = "domdfcoding"
 web = github_url = f"https://github.com/domdfcoding/domdf_python_tools"
@@ -80,16 +86,15 @@
 classifiers = [
 		'Development Status :: 4 - Beta',
 		'Intended Audience :: Developers',
-		'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
 		'Operating System :: OS Independent',
 		'Programming Language :: Python',
+		'Programming Language :: Python :: 3 :: Only',
+		'Topic :: Software Development :: Libraries :: Python Modules',
 		'Programming Language :: Python :: 3.6',
+		'Programming Language :: Python :: Implementation :: CPython',
 		'Programming Language :: Python :: 3.7',
 		'Programming Language :: Python :: 3.8',
-		'Programming Language :: Python :: 3 :: Only',
-		'Programming Language :: Python :: Implementation :: CPython',
 		'Programming Language :: Python :: Implementation :: PyPy',
-		'Topic :: Software Development :: Libraries :: Python Modules',
 		'License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)',
 
 		]

doc-source/conf.py

@@ -15,6 +15,7 @@
 from __pkginfo__ import __version__
 
 
+
 github_url = f"https://github.com/domdfcoding/domdf_python_tools"
 
 rst_prolog = f""".. |pkgname| replace:: domdf_python_tools
@@ -52,12 +53,21 @@
 		'rtd': ('https://docs.readthedocs.io/en/latest/', None),
 		'sphinx': ('http://www.sphinx-doc.org/en/stable/', None),
 		'python': ('https://docs.python.org/3/', None),
+		"NumPy": ('https://docs.scipy.org/doc/numpy/', None),
+		"SciPy": ('https://docs.scipy.org/doc/scipy/reference', None),
+		"matplotlib": ('https://matplotlib.org', None),
+		"h5py": ('https://docs.h5py.org/en/latest/', None),
+		"Sphinx": ('https://www.sphinx-doc.org/en/stable/', None),
+		"Django": ('https://docs.djangoproject.com/en/dev/', 'https://docs.djangoproject.com/en/dev/_objects/'),
+		"sarge": ('https://sarge.readthedocs.io/en/latest/', None),
+		"attrs": ('https://www.attrs.org/en/stable/', None),
 
 		}
 
 html_theme = 'sphinx_rtd_theme'
 html_theme_options = {
 		'logo_only': False,  # True will show just the logo
+
 		}
 html_theme_path = ["../.."]
 # html_logo = "logo/pyms.png"

doc-source/requirements.txt

@@ -1,3 +1,4 @@
-sphinxcontrib-httpdomain
+pytz >=2019.1
 sphinx
-pytz >= 2019.1
+sphinx_rtd_theme
+sphinxcontrib-httpdomain

git_helper.yml

@@ -63,15 +63,9 @@ classifiers:
 #  - "Development Status :: 6 - Mature"
 #  - "Development Status :: 7 - Inactive"
   - 'Intended Audience :: Developers'
-  - "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)"
   - 'Operating System :: OS Independent'
   - 'Programming Language :: Python'
-  - 'Programming Language :: Python :: 3.6'
-  - 'Programming Language :: Python :: 3.7'
-  - 'Programming Language :: Python :: 3.8'
   - "Programming Language :: Python :: 3 :: Only"
-  - "Programming Language :: Python :: Implementation :: CPython"
-  - "Programming Language :: Python :: Implementation :: PyPy"
   - 'Topic :: Software Development :: Libraries :: Python Modules'
 
 extras_require:

make_conda_recipe.py

@@ -31,7 +31,7 @@
 description_block = conda_description.replace('"', '\\"')
 
 with open(recipe_dir / "meta.yaml", "w") as fp:
-	fp.write(f"""{{% set name = "{modname}" %}}
+	fp.write(f"""{{% set name = "{pypi_name}" %}}
 {{% set version = "{__version__}" %}}
 
 package:
@@ -43,7 +43,7 @@
 
 build:
 #  entry_points:
-#    - {modname} = {modname}:main
+#    - {import_name} = {import_name}:main
 #  skip_compile_pyc:
 #    - "*/templates/*.py"          # These should not (and cannot) be compiled
   noarch: python
@@ -64,7 +64,7 @@
 
 test:
   imports:
-    - {modname}
+    - {import_name}
 
 about:
   home: "{web}"

setup.py

@@ -17,7 +17,7 @@
 		install_requires=install_requires,
 		license=__license__,
 		long_description=long_description,
-		name=modname,
+		name=pypi_name,
 		packages=find_packages(exclude=("tests", "doc-source")),
 		project_urls=project_urls,
 		py_modules=py_modules,

tox.ini

@@ -1,6 +1,6 @@
 # This file is managed by `git_helper`. Don't edit it directly
 
-# This file must be in the dir as setup.py
+# This file must be in the same dir as setup.py
 [tox]
 envlist = py36, py37, py38, pypy3,
 skip_missing_interpreters = True