-
Notifications
You must be signed in to change notification settings - Fork 3.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat!: expose per-release edx-sandbox dependency pins #34509
Merged
kdmccormick
merged 5 commits into
openedx:master
from
kdmccormick:kdmccormick/versioned-sandbox
Apr 18, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4b26e9d
build: replace wget->curl, so make upgrade works in tutor
kdmccormick 39f75f2
refactor: remove requirements/edx-sandbox/shared.[in,txt]
kdmccormick e2734e3
feat!: expose per-release edx-sandbox dependency pins
kdmccormick 0db1cc3
feat: freeze edx-sandbox requirements for quince
kdmccormick 85643a1
feat: link py38.txt->release/quince.txt for backwards compatibility
kdmccormick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| edx-sandbox: a Python environment for sandboxed execution with CodeJail | ||
| ####################################################################### | ||
|
|
||
| The requirements in this directory describe a Python environment separate from | ||
| the general edx-platform environment. When correctly configured with | ||
| `CodeJail <https://github.com/openedx/codejail>`_, edx-platform can use | ||
| it to execute untrusted code, particularly instructor-authored Python code | ||
| within ``<script type="loncapa/python">`` ProblemBlock tags. | ||
|
|
||
| Files in this directory | ||
| *********************** | ||
|
|
||
| base.in | ||
| ======= | ||
|
|
||
| This is the current set of requirements or the edx-sandbox | ||
| environment, and it is used to generate the ``.txt`` files described below. | ||
| These requirements share some constraints with the general edx-platform | ||
| requirements (via ``../constraints.txt``), but otherwise, they are completely | ||
| separate. | ||
|
|
||
| We do not recommend installing from this file directly, because | ||
| the packages are not pinned. | ||
|
|
||
| base.txt | ||
| ======== | ||
|
|
||
| These are the latest requirement pins for edx-sandbox. | ||
| They are regularly updated with the latest compatible versions of each package. | ||
|
|
||
| Install from this file if you wish to always run the latest edx-sandbox | ||
| environment. Take note that there will periodically be breaking changes to | ||
| ``base.txt``. For example, we may update the Python version used to generate | ||
| the pins, which may break edx-sandbox environments running older Python | ||
| versions. | ||
|
|
||
| releases/(RELEASE_NAME).txt | ||
| =========================== | ||
|
|
||
| *e.g. releases/redwood.txt, releases/sumac.txt, etc.* | ||
|
|
||
| Starting with Quince, every named Open edX release adds one of these files. | ||
| They contain the requirement pins corresponding to ``base.txt`` at the time | ||
| of each release. | ||
|
|
||
| Install from one of these files if you want to run a stable edx-sandbox | ||
| environment without breaking changes. | ||
|
|
||
| Support windows | ||
| *************** | ||
|
|
||
| Only ``base.txt`` and the latest ``release/*.txt`` from the latest named | ||
| release are supported by the Open edX community. However, we will leave | ||
| old ``release/*.txt`` files in the repository to assist: | ||
|
|
||
| * operators who want to stagger their edx-sandbox upgrade from their general | ||
| edx-platform upgrade | ||
| * operators who need to temporarily roll back their edx-sandbox environments | ||
| so that instructors can fix their loncapa Python code. |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| # | ||
| # This file is autogenerated by pip-compile with Python 3.8 | ||
| # by the following command: | ||
| # | ||
| # make upgrade | ||
| # | ||
| cffi==1.16.0 | ||
| # via cryptography | ||
| chem==1.2.0 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| click==8.1.6 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # nltk | ||
| codejail-includes==1.0.0 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| contourpy==1.1.1 | ||
| # via matplotlib | ||
| cryptography==38.0.4 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/base.in | ||
| cycler==0.12.1 | ||
| # via matplotlib | ||
| fonttools==4.49.0 | ||
| # via matplotlib | ||
| importlib-resources==6.1.1 | ||
| # via matplotlib | ||
| joblib==1.3.2 | ||
| # via nltk | ||
| kiwisolver==1.4.5 | ||
| # via matplotlib | ||
| lxml==4.9.4 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/base.in | ||
| # openedx-calc | ||
| markupsafe==2.1.5 | ||
| # via | ||
| # chem | ||
| # openedx-calc | ||
| matplotlib==3.7.5 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| mpmath==1.3.0 | ||
| # via sympy | ||
| networkx==3.1 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| nltk==3.8.1 | ||
| # via | ||
| # -r requirements/edx-sandbox/base.in | ||
| # chem | ||
| numpy==1.22.4 | ||
| # via | ||
| # chem | ||
| # contourpy | ||
| # matplotlib | ||
| # openedx-calc | ||
| # scipy | ||
| openedx-calc==3.1.0 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| packaging==23.2 | ||
| # via matplotlib | ||
| pillow==10.2.0 | ||
| # via matplotlib | ||
| pycparser==2.21 | ||
| # via cffi | ||
| pyparsing==3.1.1 | ||
| # via | ||
| # -r requirements/edx-sandbox/base.in | ||
| # chem | ||
| # matplotlib | ||
| # openedx-calc | ||
| python-dateutil==2.8.2 | ||
| # via matplotlib | ||
| random2==1.0.2 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| regex==2023.12.25 | ||
| # via nltk | ||
| scipy==1.7.3 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/base.in | ||
| # chem | ||
| # openedx-calc | ||
| six==1.16.0 | ||
| # via | ||
| # chem | ||
| # codejail-includes | ||
| # python-dateutil | ||
| sympy==1.12 | ||
| # via | ||
| # -r requirements/edx-sandbox/base.in | ||
| # openedx-calc | ||
| tqdm==4.66.2 | ||
| # via nltk | ||
| zipp==3.17.0 | ||
| # via importlib-resources |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,97 +1,4 @@ | ||
| # | ||
| # This file is autogenerated by pip-compile with Python 3.8 | ||
| # by the following command: | ||
| # | ||
| # make upgrade | ||
| # | ||
| cffi==1.16.0 | ||
| # via cryptography | ||
| chem==1.2.0 | ||
| # via -r requirements/edx-sandbox/py38.in | ||
| click==8.1.6 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # nltk | ||
| codejail-includes==1.0.0 | ||
| # via -r requirements/edx-sandbox/py38.in | ||
| contourpy==1.1.1 | ||
| # via matplotlib | ||
| cryptography==38.0.4 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/py38.in | ||
| cycler==0.12.1 | ||
| # via matplotlib | ||
| fonttools==4.49.0 | ||
| # via matplotlib | ||
| importlib-resources==6.1.1 | ||
| # via matplotlib | ||
| joblib==1.3.2 | ||
| # via nltk | ||
| kiwisolver==1.4.5 | ||
| # via matplotlib | ||
| lxml==4.9.4 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/py38.in | ||
| # openedx-calc | ||
| markupsafe==2.1.5 | ||
| # via | ||
| # chem | ||
| # openedx-calc | ||
| matplotlib==3.7.5 | ||
| # via -r requirements/edx-sandbox/py38.in | ||
| mpmath==1.3.0 | ||
| # via sympy | ||
| networkx==3.1 | ||
| # via -r requirements/edx-sandbox/py38.in | ||
| nltk==3.8.1 | ||
| # via | ||
| # -r requirements/edx-sandbox/py38.in | ||
| # chem | ||
| numpy==1.22.4 | ||
| # via | ||
| # chem | ||
| # contourpy | ||
| # matplotlib | ||
| # openedx-calc | ||
| # scipy | ||
| openedx-calc==3.1.0 | ||
| # via -r requirements/edx-sandbox/py38.in | ||
| packaging==23.2 | ||
| # via matplotlib | ||
| pillow==10.2.0 | ||
| # via matplotlib | ||
| pycparser==2.21 | ||
| # via cffi | ||
| pyparsing==3.1.1 | ||
| # via | ||
| # -r requirements/edx-sandbox/py38.in | ||
| # chem | ||
| # matplotlib | ||
| # openedx-calc | ||
| python-dateutil==2.8.2 | ||
| # via matplotlib | ||
| random2==1.0.2 | ||
| # via -r requirements/edx-sandbox/py38.in | ||
| regex==2023.12.25 | ||
| # via nltk | ||
| scipy==1.7.3 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/py38.in | ||
| # chem | ||
| # openedx-calc | ||
| six==1.16.0 | ||
| # via | ||
| # chem | ||
| # codejail-includes | ||
| # python-dateutil | ||
| sympy==1.12 | ||
| # via | ||
| # -r requirements/edx-sandbox/py38.in | ||
| # openedx-calc | ||
| tqdm==4.66.2 | ||
| # via nltk | ||
| zipp==3.17.0 | ||
| # via importlib-resources | ||
| # This file is a temporary compatibility wrapper around quince.txt. | ||
| # It will be removed before Sumac. | ||
|
|
||
| -r releases/quince.txt |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| # | ||
| # This file is autogenerated by pip-compile with Python 3.8 | ||
| # by the following command: | ||
| # | ||
| # make upgrade | ||
| # | ||
| cffi==1.16.0 | ||
| # via cryptography | ||
| chem==1.2.0 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| click==8.1.6 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # nltk | ||
| codejail-includes==1.0.0 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| contourpy==1.1.1 | ||
| # via matplotlib | ||
| cryptography==38.0.4 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/base.in | ||
| cycler==0.12.1 | ||
| # via matplotlib | ||
| fonttools==4.49.0 | ||
| # via matplotlib | ||
| importlib-resources==6.1.1 | ||
| # via matplotlib | ||
| joblib==1.3.2 | ||
| # via nltk | ||
| kiwisolver==1.4.5 | ||
| # via matplotlib | ||
| lxml==4.9.4 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/base.in | ||
| # openedx-calc | ||
| markupsafe==2.1.5 | ||
| # via | ||
| # chem | ||
| # openedx-calc | ||
| matplotlib==3.7.5 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| mpmath==1.3.0 | ||
| # via sympy | ||
| networkx==3.1 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| nltk==3.8.1 | ||
| # via | ||
| # -r requirements/edx-sandbox/base.in | ||
| # chem | ||
| numpy==1.22.4 | ||
| # via | ||
| # chem | ||
| # contourpy | ||
| # matplotlib | ||
| # openedx-calc | ||
| # scipy | ||
| openedx-calc==3.1.0 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| packaging==23.2 | ||
| # via matplotlib | ||
| pillow==10.2.0 | ||
| # via matplotlib | ||
| pycparser==2.21 | ||
| # via cffi | ||
| pyparsing==3.1.1 | ||
| # via | ||
| # -r requirements/edx-sandbox/base.in | ||
| # chem | ||
| # matplotlib | ||
| # openedx-calc | ||
| python-dateutil==2.8.2 | ||
| # via matplotlib | ||
| random2==1.0.2 | ||
| # via -r requirements/edx-sandbox/base.in | ||
| regex==2023.12.25 | ||
| # via nltk | ||
| scipy==1.7.3 | ||
| # via | ||
| # -c requirements/edx-sandbox/../constraints.txt | ||
| # -r requirements/edx-sandbox/base.in | ||
| # chem | ||
| # openedx-calc | ||
| six==1.16.0 | ||
| # via | ||
| # chem | ||
| # codejail-includes | ||
| # python-dateutil | ||
| sympy==1.12 | ||
| # via | ||
| # -r requirements/edx-sandbox/base.in | ||
| # openedx-calc | ||
| tqdm==4.66.2 | ||
| # via nltk | ||
| zipp==3.17.0 | ||
| # via importlib-resources |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit:
curlhas a-Owhich will do the same thing as thewget -Oso maybe just usecurl -OLhere?Ref: https://curl.se/docs/manpage.html#-O
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
they're a bit different:
wget -O "$(@)"means "write to a file named$(@)", which means "write to the Makefile target", which is requirements/common_constraints.txtcurl -Omeans "write to a file of the same name as the remote file", which would be just common_constraints.txt (no requirements/ prefix)