From: JinWang An <jinwang.an@samsung.com>
Date: Mon, 27 Mar 2023 08:02:46 +0000 (+0900)
Subject: Imported Upstream version 60.9.3
X-Git-Tag: upstream/60.9.3^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=958652a746e29745e9cc941ed7c7c93dc471b3f3;p=platform%2Fupstream%2Fpython-setuptools.git

Imported Upstream version 60.9.3
---

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e556292..79260da 100644
--- 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 51b248b..bb829c4 100644
--- 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 5a8d510..c680fb3 100644
--- 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 3899933..339e81f 100644
--- 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 dc921fb..4099e27 100644
--- 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"