From 2aa127c20701320c5627b82d9fc71e84e02fd114 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Thu, 3 Sep 2020 09:45:36 -0400
Subject: [PATCH] Revert pinning of setuptools (#8239)
---
INSTALL.md | 2 +-
changelog.d/8212.bugfix | 1 -
changelog.d/8239.misc | 1 +
synapse/python_dependencies.py | 4 ----
4 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 changelog.d/8212.bugfix
create mode 100644 changelog.d/8239.misc
diff --git a/INSTALL.md b/INSTALL.md
index bdb7769fe9..22f7b7c029 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -73,7 +73,7 @@ mkdir -p ~/synapse
virtualenv -p python3 ~/synapse/env
source ~/synapse/env/bin/activate
pip install --upgrade pip
-pip install --upgrade setuptools!=50.0 # setuptools==50.0 fails on some older Python versions
+pip install --upgrade setuptools
pip install matrix-synapse
```
diff --git a/changelog.d/8212.bugfix b/changelog.d/8212.bugfix
deleted file mode 100644
index 0f8c0aed92..0000000000
--- a/changelog.d/8212.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not install setuptools 50.0. It can lead to a broken configuration on some older Python versions.
diff --git a/changelog.d/8239.misc b/changelog.d/8239.misc
new file mode 100644
index 0000000000..88a3603e61
--- /dev/null
+++ b/changelog.d/8239.misc
@@ -0,0 +1 @@
+Revert pinning of setuptools.
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index d666f22674..2d995ec456 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -74,10 +74,6 @@ REQUIREMENTS = [
"Jinja2>=2.9",
"bleach>=1.4.3",
"typing-extensions>=3.7.4",
- # setuptools is required by a variety of dependencies, unfortunately version
- # 50.0 is incompatible with older Python versions, see
- # https://github.com/pypa/setuptools/issues/2352
- "setuptools!=50.0",
]
CONDITIONAL_REQUIREMENTS = {
--
GitLab