Skip to content

Commit e55136c

Browse files
authored
Revert "Pin end-to-end test Python dependencies" (matrix-org#8106)
* Revert "Fix end-to-end tests (synapse setup) (matrix-org#7420)" This reverts commit b90a0c4. * Re-apply the modernized pip install approach * setuptools2
1 parent 666cab9 commit e55136c

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

test/end-to-end-tests/element/install-webserver.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ cd $BASE_DIR
1010
source env/bin/activate
1111

1212
pip install --upgrade pip
13-
14-
# Pin setuptools to work around crash bug in v60
15-
# See https://github.com/vector-im/element-web/issues/20287
16-
pip install setuptools==v59.8.0
13+
pip install --upgrade setuptools
1714

1815
pip install ComplexHttpServer
1916

test/end-to-end-tests/synapse/install.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,8 @@ virtualenv -p python3 env
2222
source env/bin/activate
2323

2424
pip install --upgrade pip
25-
26-
# Pin setuptools to work around crash bug in v60
27-
# See https://github.com/vector-im/element-web/issues/20287
28-
pip install setuptools==v59.8.0
29-
25+
pip install --upgrade setuptools
3026
pip install https://codeload.github.com/matrix-org/synapse/zip/$SYNAPSE_BRANCH
31-
32-
# reivilibre: Suspected bug in frozendict 2.1.2 leading to a core dump...
33-
# See https://github.com/vector-im/element-web/issues/20287
34-
pip install frozendict==2.0.2
35-
3627
# apply configuration
3728
pushd env/bin/
3829
cp -r $BASE_DIR/config-templates/$CONFIG_TEMPLATE/. ./

0 commit comments

Comments
 (0)