Merge pull request #5608 from cylc/8.1.x-deconflict

🤖 Merge 8.1.x-deconflict into master
cylc · Jul 4, 2023 · f9e1cbd · f9e1cbd
2 parents 69be3f8 + d8024bc
commit f9e1cbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conda-environment.yml b/conda-environment.yml
@@ -15,7 +15,7 @@ dependencies:
   - psutil >=5.6.0
   - python
   - pyzmq >=22
-  - setuptools >=49, <67
+  - setuptools >=49
   - importlib_metadata # [py<3.8]
   - urwid >=2,<3
   - tomli >=2 # [py<3.11]

diff --git a/setup.cfg b/setup.cfg
@@ -73,7 +73,7 @@ install_requires =
     psutil>=5.6.0
     pyzmq>=22
     # https://github.com/pypa/setuptools/issues/3802
-    setuptools>=49, <67
+    setuptools>=49
     importlib_metadata; python_version < "3.8"
     urwid==2.*
     # unpinned transient dependencies used for type checking