Updated files with 'repo_helper'.

domdfcoding · domdfcoding · commit e5d821a40d77 · 2020-11-05T08:17:14.000Z
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -1,9 +1,9 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
+version: 1
 update_configs:
-- default_reviewers:
-  - domdfcoding
+- package_manager: python
   directory: /
-  package_manager: python
   update_schedule: weekly
-version: 1
+  default_reviewers:
+  - domdfcoding
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -1,24 +1,9 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
-
 addReviewers: true
 addAssignees: true
-
-# A list of reviewers to be added to pull requests (GitHub user name)
 reviewers:
-  - domdfcoding
-
-# A number of reviewers added to the pull request
-# Set 0 to add all the reviewers
+- domdfcoding
 numberOfReviewers: 0
 
-# A list of assignees, overrides reviewers if set
-# assignees:
-#   - assigneeA
-
-# A number of assignees to add to the pull request
-# Set to 0 to add all of the assignees.
-# Uses numberOfReviewers if unset.
-# numberOfAssignees: 2
-
 # more settings at https://github.com/marketplace/actions/auto-assign-action
diff --git a/.isort.cfg b/.isort.cfg
@@ -16,15 +16,15 @@ default_section = THIRDPARTY
 known_third_party =
     asttokens
     coverage
-    coverage_pyver_pragma
-    domdf_python_tools
+    coverage-pyver-pragma
+    domdf-python-tools
     flake8
     github
     pytest
-    pytest_cov
-    pytest_randomly
-    pytest_rerunfailures
-    pytest_timeout
+    pytest-cov
+    pytest-randomly
+    pytest-rerunfailures
+    pytest-timeout
     requests
 known_first_party = flake8_dunder_all
 remove_redundant_aliases = True
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,21 +1,23 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+exclude: ^$
+
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
-   rev: v2.4.0
+   rev: v3.3.0
    hooks:
     - id: check-added-large-files
     - id: check-ast
     - id: check-byte-order-marker
     - id: check-case-conflict
     - id: check-executables-have-shebangs
     - id: check-json
+    - id: check-toml
+    - id: check-yaml
     - id: check-merge-conflict
     - id: check-symlinks
-    - id: check-toml
     - id: check-vcs-permalinks
-    - id: check-yaml
     - id: detect-private-key
     - id: end-of-file-fixer
     - id: trailing-whitespace
@@ -25,13 +27,14 @@ repos:
    rev: v0.0.4
    hooks:
     - id: requirements-txt-sorter
-      args: [--allow-git]
+      args:
+       - --allow-git
     - id: check-docstring-first
       exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup|tests/.*)\.py$
     - id: bind-requirements
 
  - repo: https://github.com/domdfcoding/flake8-dunder-all
-   rev: v0.0.4
+   rev: v0.1.0
    hooks:
     - id: ensure-dunder-all
       files: ^flake8_dunder_all/.*\.py$
@@ -42,20 +45,20 @@ repos:
     - id: python-no-eval
 
  - repo: https://github.com/asottile/pyupgrade
-   rev: v1.5.1
+   rev: v2.7.3
    hooks:
     - id: pyupgrade
-      args: [--py36-plus]
+      args:
+       - --py36-plus
 
  - repo: https://github.com/Lucas-C/pre-commit-hooks
-   rev: v1.1.7
+   rev: v1.1.9
    hooks:
     - id: remove-crlf
     - id: forbid-crlf
 
-
  - repo: https://github.com/domdfcoding/yapf-isort
-   rev: v0.3.2
+   rev: v0.4.4
    hooks:
     - id: yapf-isort
       exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,19 +1,13 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 # Read the Docs configuration file
 ---
-
-# Required
 version: 2
-
 sphinx:
   builder: html
   configuration: doc-source/conf.py
-
-# Optionally build your docs in additional formats such as PDF and ePub
 formats: all
-
 python:
   version: 3.8
   install:
-    - requirements: requirements.txt
-    - requirements: doc-source/requirements.txt
+   - requirements: requirements.txt
+   - requirements: doc-source/requirements.txt
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,6 @@ stages:
   - deploy_pypi
   - deploy_conda
 
-
 jobs:
   allow_failures:
     - arch: arm64
diff --git a/README.rst b/README.rst
@@ -18,7 +18,7 @@ flake8-dunder-all
 	* - Docs
 	  - |docs| |docs_check|
 	* - Tests
-	  - |travis| |actions_windows| |actions_macos| |coveralls| |codefactor|
+	  - |travis| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
 	* - PyPI
 	  - |pypi-version| |supported-versions| |supported-implementations| |wheel|
 	* - Anaconda
@@ -106,6 +106,10 @@ flake8-dunder-all
 	:target: https://github.com/pre-commit/pre-commit
 	:alt: pre-commit
 
+.. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/flake8-dunder-all/master.svg
+	:target: https://results.pre-commit.ci/latest/github/domdfcoding/flake8-dunder-all/master
+	:alt: pre-commit.ci status
+
 .. end shields
 
 |
diff --git a/__pkginfo__.py b/__pkginfo__.py
@@ -17,53 +17,17 @@
 __all__ = [
 		"__copyright__",
 		"__version__",
-		"modname",
-		"pypi_name",
-		"__license__",
-		"__author__",
-		"short_desc",
-		"author",
-		"author_email",
-		"github_username",
-		"web",
-		"github_url",
 		"repo_root",
 		"install_requires",
 		"extras_require",
-		"project_urls",
-
-		"import_name",
 		]
 
 __copyright__ = """
 2020 Dominic Davis-Foster <dominic@davis-foster.co.uk>
 """
 
 __version__ = "0.1.0"
-modname = "flake8-dunder-all"
-pypi_name = "flake8-dunder-all"
-import_name = "flake8_dunder_all"
-__license__ = "MIT License"
-short_desc = "A Flake8 plugin and pre-commit hook which checks to ensure modules have defined '__all__'."
-__author__ = author = 'Dominic Davis-Foster'
-author_email = 'dominic@davis-foster.co.uk'
-github_username = "domdfcoding"
-web = github_url = "https://github.com/domdfcoding/flake8-dunder-all"
+
 repo_root = pathlib.Path(__file__).parent
 install_requires = (repo_root / "requirements.txt").read_text(encoding="utf-8").split('\n')
 extras_require = {'all': []}
-
-
-
-conda_description = """A Flake8 plugin and pre-commit hook which checks to ensure modules have defined '__all__'.
-
-
-Before installing please ensure you have added the following channels: domdfcoding, conda-forge"""
-__all__.append("conda_description")
-
-
-project_urls = {
-		"Documentation": "https://flake8-dunder-all.readthedocs.io",
-		"Issue Tracker": f"{github_url}/issues",
-		"Source Code": github_url,
-		}
diff --git a/doc-source/conf.py b/doc-source/conf.py
@@ -103,6 +103,7 @@
 		"protocol",
 		"typeddict",
 		"namedtuple",
+		"exception",
 		}
 
 add_module_names = False
diff --git a/doc-source/index.rst b/doc-source/index.rst
@@ -17,7 +17,7 @@ flake8-dunder-all
 	* - Docs
 	  - |docs| |docs_check|
 	* - Tests
-	  - |travis| |actions_windows| |actions_macos| |coveralls| |codefactor|
+	  - |travis| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
 	* - PyPI
 	  - |pypi-version| |supported-versions| |supported-implementations| |wheel|
 	* - Anaconda
@@ -106,6 +106,9 @@ flake8-dunder-all
 .. |pre_commit| pre-commit-shield::
 	:alt: pre-commit
 
+.. |pre_commit_ci| pre-commit-ci-shield::
+	:alt: pre-commit.ci status
+
 .. end shields
 
 Installation
diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
@@ -3,13 +3,14 @@ default-values>=0.2.0
 domdf-sphinx-theme>=0.1.0
 extras-require>=0.2.0
 pyyaml>=5.3.1
+repo-helper-sphinx-theme>=0.0.2
 seed-intersphinx-mapping>=0.1.1
 sphinx>=3.0.3
 sphinx-copybutton>=0.2.12
 sphinx-notfound-page>=0.5
 sphinx-prompt>=1.1.0
 sphinx-tabs>=1.1.13
-sphinx-toolbox>=1.6.1
+sphinx-toolbox>=1.7.1
 sphinxcontrib-httpdomain>=1.7.0
 sphinxemoji>=0.1.6
 tabulate>=0.8.7
diff --git a/make_conda_recipe.py b/make_conda_recipe.py
@@ -1,43 +1,48 @@
 #!/usr/bin/python3
 
-# This file is managed by `repo_helper`. Don't edit it directly.
+# This file is managed by 'repo_helper'. Don't edit it directly.
+
+# stdlib
+import pathlib
 
 # this package
-from __pkginfo__ import *  # pylint: disable=wildcard-import
+from __pkginfo__ import __version__
+
+description_block = """A Flake8 plugin and pre-commit hook which checks to ensure modules have defined '__all__'.
+
+
+
+Before installing please ensure you have added the following channels: domdfcoding, conda-forge
+""".replace('"', '\\"')
 
+
+repo_root = pathlib.Path(__file__).parent
 recipe_dir = repo_root / "conda"
 
 if not recipe_dir.exists():
 	recipe_dir.mkdir()
 
-# TODO: entry_points, manifest
+all_requirements = (repo_root / "requirements.txt").read_text(encoding="utf-8").split('\n')
 
-all_requirements = install_requires[:]
+# TODO: entry_points, manifest
 
-if isinstance(extras_require, dict):
-	for requires in extras_require.values():
-		all_requirements += requires
+for requires in {'all': []}.values():
+	all_requirements += requires
 
 all_requirements = {x.replace(" ", '') for x in set(all_requirements)}
 requirements_block = "\n".join(f"    - {req}" for req in all_requirements if req)
 
-description_block = conda_description.replace('"', '\\"')
-
 (recipe_dir / "meta.yaml").write_text(
 		encoding="UTF-8",
 		data=f"""\
 package:
-  name: "{pypi_name.lower()}"
+  name: "flake8-dunder-all"
   version: "{__version__}"
 
 source:
-  url: "https://pypi.io/packages/source/{pypi_name[0]}/{pypi_name}/{pypi_name}-{__version__}.tar.gz"
+  url: "https://pypi.io/packages/source/f/flake8-dunder-all/flake8-dunder-all-{__version__}.tar.gz"
 
 build:
-#  entry_points:
-#    - {import_name} = {import_name}:main
-#  skip_compile_pyc:
-#    - "*/templates/*.py"          # These should not (and cannot) be compiled
   noarch: python
   script: "{{{{ PYTHON }}}} -m pip install . -vv"
 
@@ -56,22 +61,22 @@
 
 test:
   imports:
-    - {import_name}
+    - flake8_dunder_all
 
 about:
-  home: "{web}"
-  license: "{__license__}"
+  home: "https://github.com/domdfcoding/flake8-dunder-all"
+  license: "MIT License"
   # license_family: LGPL
   # license_file: LICENSE
-  summary: "{short_desc}"
+  summary: "A Flake8 plugin and pre-commit hook which checks to ensure modules have defined '__all__'."
   description: "{description_block}"
-  doc_url: {project_urls["Documentation"]}
-  dev_url: {project_urls["Source Code"]}
+  doc_url: https://flake8-dunder-all.readthedocs.io
+  dev_url: https://github.com/domdfcoding/flake8-dunder-all
 
 extra:
   maintainers:
-    - {author}
-    - github.com/{github_username}
+    - Dominic Davis-Foster
+    - github.com/domdfcoding
 
 """)
 
diff --git a/setup.cfg b/setup.cfg
@@ -37,7 +37,7 @@ classifiers =
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.6.1
 zip_safe = False
 include_package_data = True
 packages = find:
@@ -52,6 +52,7 @@ exclude =
 python_version = 3.6
 namespace_packages = True
 check_untyped_defs = True
+warn_unused_ignores = True
 
 [options.entry_points]
 flake8.extension =
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@`
`103`	`103`	`"protocol",`
`104`	`104`	`"typeddict",`
`105`	`105`	`"namedtuple",`
	`106`	`+ "exception",`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`add_module_names = False`