Sync config with master

domdfcoding · domdfcoding · commit cc5feb5f14ab · 2021-05-04T23:01:05.000+01:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -17,3 +17,7 @@ replace = : str = "{new_version}"
 [bumpversion:file:repo_helper.yml]
 
 [bumpversion:file:pyproject.toml]
+
+[bumpversion:file:setup.cfg]
+search = version = {current_version}
+replace = version = {new_version}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
       args:
        - --allow-git
     - id: check-docstring-first
-      exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup|tests/.*)\.py$
+      exclude: ^(doc-source/conf|__pkginfo__|setup|tests/.*)\.py$
     - id: bind-requirements
 
  - repo: https://github.com/domdfcoding/flake8-dunder-all
@@ -54,7 +54,7 @@ repos:
     - id: rst-inline-touching-normal
 
  - repo: https://github.com/asottile/pyupgrade
-   rev: v2.11.0
+   rev: v2.12.0
    hooks:
     - id: pyupgrade
       args:
@@ -71,10 +71,10 @@ repos:
    rev: v0.4.3
    hooks:
     - id: formate
-      exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.(_)?py$
+      exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
 
  - repo: https://github.com/domdfcoding/dep_checker
-   rev: v0.6.0
+   rev: v0.6.2
    hooks:
     - id: dep_checker
       args:
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -15,3 +15,5 @@ python:
    - requirements: doc-source/requirements.txt
    - method: pip
      path: .
+     extra_requirements:
+      - all
diff --git a/README.rst b/README.rst
@@ -25,7 +25,7 @@ domdf_python_tools
 	* - Activity
 	  - |commits-latest| |commits-since| |maintained| |pypi-downloads|
 	* - QA
-	  - |codefactor| |actions_flake8| |actions_mypy| |pre_commit_ci|
+	  - |codefactor| |actions_flake8| |actions_mypy|
 	* - Other
 	  - |license| |language| |requires|
 
@@ -115,10 +115,6 @@ domdf_python_tools
 	:target: https://pypi.org/project/domdf_python_tools/
 	:alt: PyPI - Downloads
 
-.. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/domdf_python_tools/master.svg
-	:target: https://results.pre-commit.ci/latest/github/domdfcoding/domdf_python_tools/master
-	:alt: pre-commit.ci status
-
 .. end shields
 
 
@@ -143,8 +139,8 @@ To install with ``conda``:
 
 	.. code-block:: bash
 
-		$ conda config --add channels http://conda.anaconda.org/conda-forge
-		$ conda config --add channels http://conda.anaconda.org/domdfcoding
+		$ conda config --add channels https://conda.anaconda.org/conda-forge
+		$ conda config --add channels https://conda.anaconda.org/domdfcoding
 
 	* Then install
 
diff --git a/__pkginfo__.py b/__pkginfo__.py
@@ -11,24 +11,12 @@
 # This script based on https://github.com/rocky/python-uncompyle6/blob/master/__pkginfo__.py
 #
 
-# stdlib
-import pathlib
-
 __all__ = [
-		"__copyright__",
 		"__version__",
-		"repo_root",
-		"install_requires",
 		"extras_require",
 		]
 
-__copyright__ = """
-2019-2021 Dominic Davis-Foster <dominic@davis-foster.co.uk>
-"""
-
 __version__ = "2.9.0"
-repo_root = pathlib.Path(__file__).parent
-install_requires = (repo_root / "requirements.txt").read_text(encoding="utf-8").split('\n')
 extras_require = {
 		"dates": ["pytz>=2019.1"],
 		"testing": ["pytest>=6.2.0", "pytest-regressions>=2.0.2"],
diff --git a/doc-source/conf.py b/doc-source/conf.py
@@ -22,6 +22,11 @@
 author = config["author"]
 documentation_summary = config.description
 
+# 3rd party
+import domdf_python_tools
+
+domdf_python_tools.__docs = True
+
 github_url = "https://github.com/{github_username}/{github_repository}".format_map(config)
 
 rst_prolog = f""".. |pkgname| replace:: domdf_python_tools
diff --git a/doc-source/index.rst b/doc-source/index.rst
@@ -28,7 +28,7 @@ domdf_python_tools
 		* - Activity
 		  - |commits-latest| |commits-since| |maintained| |pypi-downloads|
 		* - QA
-		  - |codefactor| |actions_flake8| |actions_mypy| |pre_commit_ci|
+		  - |codefactor| |actions_flake8| |actions_mypy|
 		* - Other
 		  - |license| |language| |requires|
 
@@ -121,9 +121,6 @@ domdf_python_tools
 		:downloads: month
 		:alt: PyPI - Downloads
 
-	.. |pre_commit_ci| pre-commit-ci-shield::
-		:alt: pre-commit.ci status
-
 .. end shields
 
 
diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
@@ -14,6 +14,7 @@ sphinx-debuginfo>=0.1.0
 sphinx-highlights>=0.1.0
 sphinx-notfound-page>=0.5
 sphinx-prompt>=1.1.0
+sphinx-pyproject>=0.1.0
 sphinx-tabs>=1.1.13
 sphinx-toolbox>=2.2.0
 sphinxcontrib-httpdomain>=1.7.0
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,8 +11,8 @@ keywords = [ "utilities",]
 dynamic = [ "requires-python", "classifiers", "dependencies",]
 
 [[project.authors]]
-email = "dominic@davis-foster.co.uk"
 name = "Dominic Davis-Foster"
+email = "dominic@davis-foster.co.uk"
 
 
 [project.license]
diff --git a/setup.cfg b/setup.cfg
@@ -8,6 +8,7 @@
 
 [metadata]
 name = domdf_python_tools
+version = 2.9.0
 author = Dominic Davis-Foster
 author_email = dominic@davis-foster.co.uk
 license = GNU Lesser General Public License v3 or later (LGPLv3+)
diff --git a/setup.py b/setup.py
@@ -2,6 +2,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 
 # stdlib
+import pathlib
 import shutil
 import sys
 
@@ -13,6 +14,9 @@
 # this package
 from __pkginfo__ import *  # pylint: disable=wildcard-import
 
+repo_root = pathlib.Path(__file__).parent
+install_requires = (repo_root / "requirements.txt").read_text(encoding="UTF-8").split('\n')
+
 setup(
 		description="Helpful functions for Python 🐍 🛠️",
 		extras_require=extras_require,
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -6,11 +6,12 @@ coverage>=5.1
 coverage-pyver-pragma>=0.2.1
 faker>=4.1.2
 flake8>=3.8.4
+importlib-metadata>=3.6.0
 iniconfig!=1.1.0,>=1.0.1
 pandas>=1.0.0; implementation_name == "cpython" and python_version < "3.10"
 pytest>=6.0.0
 pytest-cov>=2.8.1
-pytest-randomly>=3.6.0
+pytest-randomly>=3.7.0
 pytest-regressions>=2.0.1
 pytest-rerunfailures>=9.1.1
 pytest-timeout>=1.4.2
diff --git a/tox.ini b/tox.ini
@@ -100,6 +100,10 @@ basepython = python3.6
 skip_install = True
 ignore_errors = True
 whitelist_externals = /bin/bash
+passenv =
+    COV_PYTHON_VERSION
+    COV_PLATFORM
+    COV_PYTHON_IMPLEMENTATION
 changedir = {toxinidir}
 deps =
     coverage>=5
