From 29f66dd71222e5f0c57dda3d41760d272529ccf0 Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Mon, 30 Jan 2023 16:58:03 +0000
Subject: [PATCH] Cherry pick #5333

fix to make setup.cfg work with setuptools v67.0.0
---
 conda-environment.yml | 4 ++--
 setup.cfg             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conda-environment.yml b/conda-environment.yml
index 03509790804..2a33dada664 100644
--- a/conda-environment.yml
+++ b/conda-environment.yml
@@ -16,10 +16,10 @@ dependencies:
   - psutil >=5.6.0
   - python
   - pyzmq >=22,<23
-  - setuptools >=49
+  - setuptools >=49, <67
   - urwid >=2,<3
   # Add # [py<3.11] for tomli once Python 3.11 Released
-  - tomli >=2.0.0
+  - tomli >=2
 
 # optional dependencies
   #- empy >=3.3,<3.4
diff --git a/setup.cfg b/setup.cfg
index 9d8a27c2539..bdd3b5abc2b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -72,13 +72,13 @@ install_requires =
     protobuf>=4.21.2,<4.22.0
     psutil>=5.6.0
     pyzmq==22.*
-    setuptools>=49
+    # https://github.com/pypa/setuptools/issues/3802
+    setuptools>=49, <67
     urwid==2.*
     # unpinned transient dependencies used for type checking
     rx
     promise
-    # Once Python 3.11 released -'; python_version<"3.11"'
-    tomli>=2.*
+    tomli>=2; python_version < "3.11"
 
 [options.packages.find]
 include = cylc*