Merge https://github.com/jaraco/skeleton

8 files changed, 27 insertions, 21 deletions

diff --git a/.flake8 b/.flake8
index 5e876dc8..9c97f00d 100644
--- a/.flake8
+++ b/.flake8
@@ -1,13 +1,15 @@
 [flake8]
 max-line-length = 88
+
+# jaraco/skeleton#34
+max-complexity = 10
+
 exclude =
 	setuptools/_vendor
 	pkg_resources/_vendor
+
 extend-ignore =
 	# Black creates whitespace before colon
 	E203
 	setuptools/site-patch.py F821
 	setuptools/py*compat.py F811
-
-# Let's not overcomplicate the code:
-max-complexity = 10
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 31b94144..f544814c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Automated Tests
+name: tests
 
 on: [push, pull_request]
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6639c78c..c15ab0c9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: stable
+  rev: 20.8b1
   hooks:
   - id: black
 
 - repo: https://github.com/asottile/blacken-docs
-  rev: v1.8.0
+  rev: v1.9.1
   hooks:
   - id: blacken-docs
diff --git a/README.rst b/README.rst
index 526d1222..9bd03cf9 100644
--- a/README.rst
+++ b/README.rst
@@ -6,9 +6,9 @@
 
 .. _PyPI link: https://pypi.org/project/setuptools
 
-.. image:: https://github.com/pypa/setuptools/workflows/Automated%20Tests/badge.svg
-   :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22Automated+Tests%22
-   :alt: Automated Tests
+.. image:: https://github.com/pypa/setuptools/workflows/tests/badge.svg
+   :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22
+   :alt: tests
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :target: https://github.com/psf/black
diff --git a/pyproject.toml b/pyproject.toml
index 658514d3..0bc2a46f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,18 +12,16 @@ skip-string-normalization = true
 
 [tool.setuptools_scm]
 
-# jaraco/skeleton#22
-[tool.jaraco.pytest.plugins.black]
+[pytest.enabler.black]
 #addopts = "--black"
 
-# jaraco/skeleton#22
-[tool.jaraco.pytest.plugins.mypy]
+[pytest.enabler.mypy]
 #addopts = "--mypy"
 
-[tool.jaraco.pytest.plugins.flake8]
+[pytest.enabler.flake8]
 addopts = "--flake8"
 
-[tool.jaraco.pytest.plugins.cov]
+[pytest.enabler.cov]
 addopts = "--cov"
 
 [tool.towncrier]
diff --git a/setup.cfg b/setup.cfg
index 64034e02..4e7312a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,7 +23,7 @@ project_urls =
     Documentation = https://setuptools.readthedocs.io/
 
 [options]
-packages = find:
+packages = find_namespace:
 py_modules = easy_install
 # disabled as it causes tests to be included #2505
 # include_package_data = true
@@ -31,7 +31,12 @@ python_requires = >=3.6
 install_requires =
 
 [options.packages.find]
-exclude = *.tests
+exclude =
+        build*
+        docs*
+        tests*
+        *.tests
+        tools*
 
 [options.extras_require]
 testing =
@@ -42,8 +47,7 @@ testing =
 	pytest-black >= 0.3.7; python_implementation != "PyPy"
 	pytest-cov
 	pytest-mypy; python_implementation != "PyPy"
-	# jaraco/skeleton#22
-	jaraco.test >= 3.2.0
+	pytest-enabler
 
 	# local
     mock
diff --git a/skeleton.md b/skeleton.md
index dd8ec014..0938f892 100644
--- a/skeleton.md
+++ b/skeleton.md
@@ -138,6 +138,8 @@ Features include:
 - test against multiple Python versions
 - run on late (and updated) platform versions
 - automated releases of tagged commits
+- [automatic merging of PRs](https://github.com/marketplace/actions/merge-pull-requests) (requires [protecting branches with required status checks](https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/enabling-required-status-checks), [not possible through API](https://github.community/t/set-all-status-checks-to-be-required-as-branch-protection-using-the-github-api/119493))
+
 
 ### Continuous Deployments
 
diff --git a/tox.ini b/tox.ini
index 9680ec01..8083d8c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,7 @@ commands =
 [testenv:release]
 skip_install = True
 deps =
-	pep517>=0.5
+	build
 	twine[keyring]>=1.13
 	path
 	jaraco.develop>=7.1
@@ -70,7 +70,7 @@ commands =
 	python -c "import path; path.Path('dist').rmtree_p()"
 	# unset tag_build and tag_date pypa/setuptools#2500
 	python setup.py egg_info -Db "" saveopts
-	python -m pep517.build .
+	python -m build
 	python -m twine upload dist/*
 	python -m jaraco.develop.create-github-release
 	python -m jaraco.tidelift.publish-release-notes