Browse Source

Revert pinning of setuptools (#8239)

Patrick Cloke 3 years ago
parent
commit
2aa127c207
4 changed files with 2 additions and 6 deletions
  1. 1 1
      INSTALL.md
  2. 0 1
      changelog.d/8212.bugfix
  3. 1 0
      changelog.d/8239.misc
  4. 0 4
      synapse/python_dependencies.py

+ 1 - 1
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
 ```
 

+ 0 - 1
changelog.d/8212.bugfix

@@ -1 +0,0 @@
-Do not install setuptools 50.0. It can lead to a broken configuration on some older Python versions.

+ 1 - 0
changelog.d/8239.misc

@@ -0,0 +1 @@
+Revert pinning of setuptools.

+ 0 - 4
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 = {