Skip to content

Conversation

squahtx
Copy link
Contributor

@squahtx squahtx commented Mar 25, 2022

Instead of relying on the version of extras installed at Docker build time
or through explicit pip installs, ensure that appropriate versions of
all extras are installed at test time. In particular, the url_preview
(which implies lxml), postgres (which implies psycopg2) and redis extras
are wanted.

Signed-off-by: Sean Quah seanq@element.io

Instead of relying on the version of extras installed at Docker build time
or through explicit `pip install`s, ensure that appropriate versions of
all extras are installed at test time. In particular, the url_preview
(which implies lxml), postgres (which implies psycopg2) and redis extras
are wanted.

Signed-off-by: Sean Quah <seanq@element.io>
@squahtx squahtx requested a review from a team as a code owner March 25, 2022 15:08
@@ -14,14 +14,13 @@ RUN mkdir /src
# Manually upgrade pip to ensure it can locate Cryptography's binary wheels
RUN ${PYTHON_VERSION} -m venv /venv && /venv/bin/pip install -U pip
RUN /venv/bin/pip install -q --no-cache-dir matrix-synapse[all]
RUN /venv/bin/pip install -q --no-cache-dir lxml psycopg2 coverage codecov
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Turns out #1219 wasn't really needed and I was just bad at reading.

Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

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

Sorry I didn't spot this. Many levels of nesting and indirection with all of this gubbins!

LGTM and I think this makes things a little clearer.

@squahtx
Copy link
Contributor Author

squahtx commented Mar 25, 2022

Thank you for the speedy review!

@squahtx squahtx merged commit 4160666 into develop Mar 25, 2022
@squahtx squahtx deleted the squah/install_correct_extras branch March 25, 2022 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants