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

jaraco · Jan 30, 2021 · b4f4ddb · b4f4ddb
2 parents 7536d0a + 0df4081
commit b4f4ddb
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 26 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,9 +1,9 @@
 [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
diff --git 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
@@ -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
@@ -6,9 +6,9 @@
 
 .. _PyPI link: https://pypi.org/project/zipp
 
-.. image:: https://github.com/jaraco/zipp/workflows/Automated%20Tests/badge.svg
-   :target: https://github.com/jaraco/zipp/actions?query=workflow%3A%22Automated+Tests%22
-   :alt: Automated Tests
+.. image:: https://github.com/jaraco/zipp/workflows/tests/badge.svg
+   :target: https://github.com/jaraco/zipp/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/docs/index.rst b/docs/index.rst
@@ -1,5 +1,5 @@
-Welcome to zipp documentation!
-========================================
+Welcome to |project| documentation!
+===================================
 
 .. toctree::
    :maxdepth: 1

diff --git a/pyproject.toml b/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"
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,6 @@
 [metadata]
-license_file = LICENSE
+license_files =
+	LICENSE
 name = zipp
 author = Jason R. Coombs
 author_email = jaraco@jaraco.com
@@ -14,13 +15,19 @@ classifiers =
 	Programming Language :: Python :: 3 :: Only
 
 [options]
+packages = find_namespace:
 py_modules = zipp
-packages = find:
 include_package_data = true
 python_requires = >=3.6
 install_requires =
 setup_requires = setuptools_scm[toml] >= 3.4.1
 
+[options.packages.find]
+exclude =
+        build*
+        docs*
+        tests*
+
 [options.extras_require]
 testing =
 	# upstream
@@ -30,8 +37,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
 	jaraco.itertools
@@ -40,7 +46,7 @@ testing =
 docs =
 	# upstream
 	sphinx
-	jaraco.packaging >= 3.2
+	jaraco.packaging >= 8.2
 	rst.linker >= 1.9
 
 	# local

diff --git 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.saobby.my.eu.orgmunity/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
@@ -24,7 +24,7 @@ commands =
 [testenv:release]
 skip_install = True
 deps =
-	pep517>=0.5
+	build
 	twine[keyring]>=1.13
 	path
 	jaraco.develop>=7.1
@@ -35,6 +35,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