Merge branch 'main' into joycebrum/main

Author: jaraco

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 67.3.2
+current_version = 68.0.0
 commit = True
 tag = True
 

.coveragerc

@@ -2,7 +2,8 @@
 omit =
 	# leading `*/` for pytest-dev/pytest-cov#456
 	*/.tox/*
-	*/pep517-build-env-*
+disable_warnings =
+	couldnt-parse
 
 	# local
 	*/_validate_pyproject/*  # generated code, tested in `validate-pyproject`

.flake8

@@ -9,10 +9,10 @@ Closes <!-- issue number here -->
 
 ### Pull Request Checklist
 - [ ] Changes have tests
-- [ ] News fragment added in [`changelog.d/`].
+- [ ] News fragment added in [`newsfragments/`].
   _(See [documentation][PR docs] for details)_
 
 
-[`changelog.d/`]: https://github.com/pypa/setuptools/tree/master/changelog.d
+[`newsfragments/`]: https://github.com/pypa/setuptools/tree/master/newsfragments
 [PR docs]:
 https://setuptools.pypa.io/en/latest/development/developer-guide.html#making-a-pull-request

.github/pull_request_template.md

@@ -2,16 +2,16 @@ name: tests
 
 on: [push, pull_request, workflow_dispatch]
 
-permissions:
-  contents: read
-
 concurrency:
   group: >-
     ${{ github.workflow }}-
     ${{ github.ref_type }}-
     ${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 env:
   # Environment variables to support color support (jaraco/skeleton#66):
   # Request colored output from CLI tools supporting it. Different tools
@@ -122,8 +122,6 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup Python
         uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python }}${{ matrix.dev }}
       - name: Install tox
         run: |
           python -m pip install tox
@@ -231,10 +229,10 @@ jobs:
         run: tox -e integration
 
   release:
-    needs:
-    - check
     permissions:
       contents: write
+    needs:
+    - check
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     timeout-minutes: 75

.github/workflows/main.yml

@@ -5,9 +5,8 @@ python:
     extra_requirements:
       - docs
 
-# workaround for readthedocs/readthedocs.org#9623
+# required boilerplate readthedocs/readthedocs.org#10401
 build:
-  # workaround for readthedocs/readthedocs.org#9635
   os: ubuntu-22.04
   tools:
     python: "3"