From fc5c0ce22b918637cebe4b0fc484d59a0184fe67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 10 Jul 2024 14:57:45 -0400
Subject: [PATCH] Move workaround for #3921 to the local section, restoring
 upstream to match upstream.

---
 pyproject.toml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b8d0116b542..66d0b5af9d0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,8 +39,7 @@ test = [
 	"pytest-cov",
 	"pytest-mypy",
 	"pytest-enabler >= 2.2",
-	# workaround for pypa/setuptools#3921
-	'pytest-ruff >= 0.3.2; sys_platform != "cygwin"',
+	"pytest-ruff >= 0.2.1",
 
 	# local
 	"virtualenv>=13.0.0",
@@ -66,6 +65,10 @@ test = [
 	"importlib_metadata",
 	"pytest-subprocess",
 
+	# require newer pytest-ruff than upstream for pypa/setuptools#4368
+	# also exclude cygwin for pypa/setuptools#3921
+	"pytest-ruff >= 0.3.2; sys_platform != "cygwin"',
+
 	# workaround for pypa/setuptools#4333
 	"pyproject-hooks!=1.1",