From 02bf6eadb91bf1df7f0a3477834f14143b04792b Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Mon, 19 Sep 2022 13:24:32 -0400 Subject: [PATCH] build: install GitHub-hosted dependencies as wheels We update github.in to use the proper git-based depencency format specified in the file comment. This format installs a package as a pre-built wheel: git+https://github.com/... instead of a development-mode editable requirement: -e https://github.com/... Installing packages in editable mode increases the amount of time it takes to install edx-platform dependencies, increases the resulting virtual environment's size, and installs packages in a way that has several subtle differences compared to the way wheels are installed: https://setuptools.pypa.io/en/latest/userguide/development_mode.html#limitations --- requirements/edx/github.in | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 2597a295c774..8cd899aeadf8 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -65,13 +65,19 @@ # tight-loop work in progress. # # * Alphabetize dependencies by DIST-NAME. --e git+https://github.com/openedx/blockstore.git@1.2.1#egg=blockstore==1.2.1 # Note: Blockstore 1.2.2 is failing. --e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 -git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 --e git+https://github.com/openedx/django-wiki.git@1.1.1#egg=django-wiki +#git+https://github.com/openedx/blockstore.git@1.2.5#egg=blockstore==1.2.5 # See blockstore comment below. +git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 +git+https://github.com/openedx/django-require.git@f4f01e4e959adc6210873ae99e7f2c3741afbf35#egg=django-require==1.0.12 +git+https://github.com/openedx/django-wiki.git@1.1.1#egg=django-wiki git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 --e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner --e git+https://github.com/openedx/RateXBlock.git@2.0.1#egg=rate-xblock +git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner +git+https://github.com/openedx/RateXBlock.git@2.0.1#egg=rate-xblock git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5 --e git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive +git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive git+https://github.com/open-craft/xblock-poll@v1.12.0#egg=xblock-poll==1.12.0 + +# This will be converted to the correct format (git+https://...) soon. +# We must upgrade to blockstore>=1.2.5 in order to use the correct format, though, +# which is in progress. +# Relevant PR: https://github.com/openedx/edx-platform/pull/30620 +-e git+https://github.com/openedx/blockstore.git@1.2.1#egg=blockstore==1.2.1