From e55136cedeb9c0d7eee653877aadc57b25a92269 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 21 Mar 2022 16:30:36 -0600 Subject: [PATCH] Revert "Pin end-to-end test Python dependencies" (#8106) * Revert "Fix end-to-end tests (synapse setup) (#7420)" This reverts commit b90a0c443db141920c7f1af94e71ed0b1d78f74e. * Re-apply the modernized pip install approach * setuptools2 --- test/end-to-end-tests/element/install-webserver.sh | 5 +---- test/end-to-end-tests/synapse/install.sh | 11 +---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/test/end-to-end-tests/element/install-webserver.sh b/test/end-to-end-tests/element/install-webserver.sh index 7551888f1c..ffc57c60c9 100755 --- a/test/end-to-end-tests/element/install-webserver.sh +++ b/test/end-to-end-tests/element/install-webserver.sh @@ -10,10 +10,7 @@ cd $BASE_DIR source env/bin/activate pip install --upgrade pip - - # Pin setuptools to work around crash bug in v60 - # See https://github.com/vector-im/element-web/issues/20287 - pip install setuptools==v59.8.0 + pip install --upgrade setuptools pip install ComplexHttpServer diff --git a/test/end-to-end-tests/synapse/install.sh b/test/end-to-end-tests/synapse/install.sh index b145fb3e1b..a85fdea26d 100755 --- a/test/end-to-end-tests/synapse/install.sh +++ b/test/end-to-end-tests/synapse/install.sh @@ -22,17 +22,8 @@ virtualenv -p python3 env source env/bin/activate pip install --upgrade pip - -# Pin setuptools to work around crash bug in v60 -# See https://github.com/vector-im/element-web/issues/20287 -pip install setuptools==v59.8.0 - +pip install --upgrade setuptools pip install https://codeload.github.com/matrix-org/synapse/zip/$SYNAPSE_BRANCH - -# reivilibre: Suspected bug in frozendict 2.1.2 leading to a core dump... -# See https://github.com/vector-im/element-web/issues/20287 -pip install frozendict==2.0.2 - # apply configuration pushd env/bin/ cp -r $BASE_DIR/config-templates/$CONFIG_TEMPLATE/. ./