Merge 464cd39 into 2c73442

.pre-commit-config.yaml

@@ -66,10 +66,10 @@ repos:
     - id: remove-crlf
     - id: forbid-crlf
 
- - repo: https://github.com/domdfcoding/yapf-isort
-   rev: v0.5.5
+ - repo: https://github.com/repo-helper/formate
+   rev: v0.1.0
    hooks:
-    - id: yapf-isort
+    - id: formate
       exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$
 
  - repo: https://github.com/domdfcoding/dep_checker

CONTRIBUTING.rst

@@ -18,13 +18,13 @@ Install ``pre-commit`` with ``pip`` and install the git hook:
 Coding style
 --------------
 
-`yapf-isort <https://pypi.org/project/yapf-isort/>`_ is used for code formatting.
+`formate <https://formate.readthedocs.io>`_ is used for code formatting.
 
 It can be run manually via ``pre-commit``:
 
 .. code-block:: bash
 
-	$ pre-commit run yapf-isort -a
+	$ pre-commit run formate -a
 
 
 Or, to run the complete autoformatting suite:

doc-source/contributing.rst

@@ -18,13 +18,13 @@ Install ``pre-commit`` with ``pip`` and install the git hook:
 Coding style
 --------------
 
-`yapf-isort <https://pypi.org/project/yapf-isort/>`_ is used for code formatting.
+`formate <https://formate.readthedocs.io>`_ is used for code formatting.
 
 It can be run manually via ``pre-commit``:
 
 .. prompt:: bash
 
-	pre-commit run yapf-isort -a
+	pre-commit run formate -a
 
 
 Or, to run the complete autoformatting suite:

formate.toml

@@ -0,0 +1,60 @@
+[hooks]
+dynamic_quotes = 10
+collections-import-rewrite = 20
+reformat-generics = 40
+noqa-reformat = 60
+ellipsis-reformat = 70
+
+[config]
+indent = "\t"
+line_length = 115
+
+[hooks.yapf]
+priority = 30
+
+[hooks.isort]
+priority = 50
+
+[hooks.yapf.kwargs]
+yapf_style = ".style.yapf"
+
+[hooks.isort.kwargs]
+line_length = 115
+indent = "\"\t\t\""
+multi_line_output = 8
+import_heading_stdlib = "stdlib"
+import_heading_thirdparty = "3rd party"
+import_heading_firstparty = "this package"
+import_heading_localfolder = "this package"
+balanced_wrapping = false
+lines_between_types = 0
+use_parentheses = true
+remove_redundant_aliases = true
+default_section = "THIRDPARTY"
+known_third_party = [
+    "apeye",
+    "betamax",
+    "click",
+    "coincidence",
+    "consolekit",
+    "coverage",
+    "coverage_pyver_pragma",
+    "deprecation_alias",
+    "domdf_python_tools",
+    "dulwich",
+    "github",
+    "github3_py",
+    "github3_utils",
+    "pymacaroons",
+    "pynacl",
+    "pytest",
+    "pytest_cov",
+    "pytest_randomly",
+    "pytest_timeout",
+    "repo_helper",
+    "requests",
+    "southwark",
+    "typing_extensions",
+    "virtualenv",
+]
+known_first_party = "repo_helper_github"

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools>=40.6.0", "wheel>=0.34.2"]
+requires = [ "setuptools>=40.6.0", "wheel>=0.34.2",]
 build-backend = "setuptools.build_meta"

tox.ini

@@ -133,6 +133,7 @@ count = True
 plugins = coverage_pyver_pragma
 
 [coverage:report]
+fail_under = 80
 exclude_lines =
     raise AssertionError
     raise NotImplementedError
@@ -141,7 +142,6 @@ exclude_lines =
     if TYPE_CHECKING:
     if typing.TYPE_CHECKING:
     if __name__ == .__main__.:
-    :[\n\s]*\.\.\.
 
 [check-wheel-contents]
 ignore = W002