Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Revert pinning of setuptools #8239

Merged
merged 2 commits into from
Sep 3, 2020
Merged

Revert pinning of setuptools #8239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7987d
Revert "Do not install setuptools 50.0. (#8212)"
clokep Sep 3, 2020
675e38a
Add a changelog.
clokep Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
1 change: 0 additions & 1 deletion changelog.d/8212.bugfix
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions changelog.d/8239.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Revert pinning of setuptools.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should probably just delete this after we merge this branch?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See 15c35c2.

4 changes: 0 additions & 4 deletions synapse/python_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down