Imported Upstream version 60.9.3

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e5562928fe64dd829704f1cc52369a89aaf2cab6..79260da6cd30ffe2b578c675b7cf4765c3851fb8 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.9.2
+current_version = 60.9.3
 commit = True
 tag = True
 

diff --git a/.codecov.yml b/.codecov.yml
index 51b248baddb578c5b629075895bc5fbdef1e2e04..bb829c41e539a1597e6e8bd105edcaa1079f5e6d 100644 (file)
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -3,4 +3,10 @@ coverage:
   status:
     project:
       default:
+        informational: true  # Treat coverage info as informational only
         threshold: 0.5%
+    patch:
+      default:
+        informational: true  # Treat coverage info as informational only
+github_checks:
+  annotations: false  # Codecov may pollute the "files" diff view

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5a8d510def06f1fe8cf5de15a62072b9cdad4660..c680fb36362847535eaeff841641152d3f87e9f9 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,10 @@ name: tests
 on: [push, pull_request, workflow_dispatch]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.ref_type }}-
+    ${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 jobs:
@@ -40,9 +43,12 @@ jobs:
         run: |
           python -m pip install tox
       - name: Run tests
-        run: tox -- --cov-report xml
+        run: tox
+      - name: Create coverage report
+        if: hashFiles('.coverage') != ''  # Rudimentary `file.exists()`
+        run: pipx run coverage xml --ignore-errors
       - name: Publish coverage
-        if: false  # disabled for #2727
+        if: hashFiles('coverage.xml') != ''  # Rudimentary `file.exists()`
         uses: codecov/codecov-action@v1
         with:
           flags: >-  # Mark which lines are covered by which envs

diff --git a/CHANGES.rst b/CHANGES.rst
index 3899933148acd925f0c03220128c3734df490627..339e81f30ac8782e000c0e42392dadf183dc05e3 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v60.9.3
+-------
+
+
+Misc
+^^^^
+* #3093: Repaired automated release process.
+
+
 v60.9.2
 -------
 

diff --git a/setup.cfg b/setup.cfg
index dc921fbff2648e91d79e0f76b6fc3c09bf4d7eb4..4099e27ba9f5e05677e311bc8a71bc017542d2f4 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 60.9.2
+version = 60.9.3
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages
@@ -46,7 +46,9 @@ testing =
        pytest-black >= 0.3.7; \
                # workaround for jaraco/skeleton#22
                python_implementation != "PyPy"
-       pytest-cov
+       pytest-cov; \
+               # coverage seems to make PyPy extremely slow
+               python_implementation != "PyPy"
        pytest-mypy >= 0.9.1; \
                # workaround for jaraco/skeleton#22
                python_implementation != "PyPy"