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

Author: jaraco

.coveragerc

@@ -1,8 +1,8 @@
 [run]
 omit =
-    */.tox/*
-    tests/*
-    prepare/*
+	*/.tox/*
+	tests/*
+	prepare/*
 
 [report]
 show_missing = True

.flake8

@@ -1,10 +1,10 @@
 [flake8]
 max-line-length = 88
-ignore =
-	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
-	W503
-	# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
-	W504
+
+# jaraco/skeleton#34
+max-complexity = 10
+
+extend-ignore =
 	# Black creates whitespace before colon
 	E203
 enable-extensions = U4

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Automated Tests
+name: tests
 
 on: [push, pull_request]
 

.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

README.rst

@@ -6,9 +6,9 @@
 
 .. _PyPI link: https://pypi.org/project/importlib_metadata
 
-.. image:: https://github.com/python/importlib_metadata/workflows/Automated%20Tests/badge.svg
-   :target: https://github.com/python/importlib_metadata/actions?query=workflow%3A%22Automated+Tests%22
-   :alt: Automated Tests
+.. image:: https://github.com/python/importlib_metadata/workflows/tests/badge.svg
+   :target: https://github.com/python/importlib_metadata/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
@@ -18,8 +18,7 @@
    :target: https://importlib-metadata.readthedocs.io/en/latest/?badge=latest
 
 
-``importlib_metadata`` is a library to access the metadata for a
-Python package.
+Library to access the metadata for a Python package.
 
 As of Python 3.8, this functionality has been added to the
 `Python standard library

docs/index.rst

@@ -1,5 +1,5 @@
-Welcome to importlib_metadata
-=============================
+Welcome to |project| documentation!
+===================================
 
 ``importlib_metadata`` is a library which provides an API for accessing an
 installed package's metadata (see :pep:`566`), such as its entry points or its top-level

pyproject.toml

@@ -7,16 +7,14 @@ 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"

setup.cfg

@@ -1,57 +1,57 @@
 [metadata]
-license_file = LICENSE
+license_files =
+	LICENSE
 name = importlib_metadata
 author = Jason R. Coombs
 author_email = [email protected]
 description = Read metadata from Python packages
 long_description = file:README.rst
 url = https://github.com/python/importlib_metadata
 classifiers =
-    Development Status :: 5 - Production/Stable
-    Intended Audience :: Developers
-    License :: OSI Approved :: Apache Software License
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3 :: Only
+	Development Status :: 5 - Production/Stable
+	Intended Audience :: Developers
+	License :: OSI Approved :: Apache Software License
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3 :: Only
 
 [options]
 packages = find:
 include_package_data = true
 python_requires = >=3.6
 install_requires =
-    zipp>=0.5
-    typing-extensions>=3.6.4; python_version < "3.8"
+	zipp>=0.5
+	typing-extensions>=3.6.4; python_version < "3.8"
 setup_requires = setuptools_scm[toml] >= 3.4.1
 
 [options.packages.find]
 exclude =
-    tests*
-    docs
+	tests*
+	docs
 
 [options.extras_require]
 testing =
-    # upstream
-    pytest >= 3.5, !=3.7.3
-    pytest-checkdocs >= 1.2.3
-    pytest-flake8
-    pytest-black >= 0.3.7; python_implementation != "PyPy"
-    pytest-cov
-    pytest-mypy; python_implementation != "PyPy"
-    # jaraco/skeleton#22
-    jaraco.test >= 3.2.0
+	# upstream
+	pytest >= 3.5, !=3.7.3
+	pytest-checkdocs >= 1.2.3
+	pytest-flake8
+	pytest-black >= 0.3.7; python_implementation != "PyPy"
+	pytest-cov
+	pytest-mypy; python_implementation != "PyPy"
+	pytest-enabler
 
-    # local
-    importlib_resources>=1.3; python_version < "3.9"
-    packaging
-    pep517
-    pyfakefs
-    flufl.flake8
+	# local
+	importlib_resources>=1.3; python_version < "3.9"
+	packaging
+	pep517
+	pyfakefs
+	flufl.flake8
 
 docs =
-    # upstream
-    sphinx
-    jaraco.packaging >= 3.2
-    rst.linker >= 1.9
+	# upstream
+	sphinx
+	jaraco.packaging >= 8.2
+	rst.linker >= 1.9
 
-    # local
+	# local
 
 [options.entry_points]

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
 

tox.ini

@@ -32,14 +32,14 @@ commands =
 [testenv:perf]
 use_develop = False
 deps =
-    ipython
+	ipython
 commands =
-    python -m timeit -s 'import importlib_metadata' -- 'importlib_metadata.distribution("ipython")'
+	python -m timeit -s 'import importlib_metadata' -- 'importlib_metadata.distribution("ipython")'
 
 [testenv:release]
 skip_install = True
 deps =
-	pep517>=0.5
+	build
 	twine[keyring]>=1.13
 	path
 	jaraco.develop>=7.1
@@ -50,6 +50,6 @@ setenv =
 	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
 commands =
 	python -c "import path; path.Path('dist').rmtree_p()"
-	python -m pep517.build .
+	python -m build
 	python -m twine upload dist/*
 	python -m jaraco.develop.create-github-release