Revert "Do not install setuptools 50.0. (#8212)"

This reverts commit 318245e.
matrix-org · Sep 3, 2020 · 8a7987d · 8a7987d
1 parent 6f6f371
commit 8a7987d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git 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
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
@@ -74,10 +74,6 @@
     "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 = {