From 5a6d05656848730d32c6c03cf4688ed032f75b8d Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Wed, 20 Oct 2021 15:59:35 +0500 Subject: [PATCH] build: remove python 3.5 requirement files (#29070) --- Makefile | 1 - requirements/edx-sandbox/py35-constraints.txt | 29 ----- requirements/edx-sandbox/py35.in | 36 ------ requirements/edx-sandbox/py35.txt | 110 ------------------ scripts/post-pip-compile.sh | 3 +- 5 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 requirements/edx-sandbox/py35-constraints.txt delete mode 100644 requirements/edx-sandbox/py35.in delete mode 100644 requirements/edx-sandbox/py35.txt diff --git a/Makefile b/Makefile index b7fc901704..c278fd20d1 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,6 @@ REQ_FILES = \ requirements/edx/coverage \ requirements/edx/doc \ requirements/edx/paver \ - requirements/edx-sandbox/py35 \ requirements/edx-sandbox/py38 \ requirements/edx/base \ requirements/edx/testing \ diff --git a/requirements/edx-sandbox/py35-constraints.txt b/requirements/edx-sandbox/py35-constraints.txt deleted file mode 100644 index 23ff7b627b..0000000000 --- a/requirements/edx-sandbox/py35-constraints.txt +++ /dev/null @@ -1,29 +0,0 @@ -# constraints required for Python 3.5 support in sandbox codejail environments -# All of these constraints require python3.6+ for larger versions - -# maxminddb 2.0.0 has dropped support for Python 3.5 -maxminddb<2.0.0 -# geoip2 requires Python 3.6 && geoip2>4.0.2 requires maxminddb>=2.0.0 -geoip2<4.0.1 - -joblib<0.15.0 # 0.15.0 dropped support for Python 3.5 - -jsonfield2<3.1.0 # jsonfield2 3.1.0 drops support for python 3.5 - -kiwisolver<1.2.0 # kiwisolver 1.2.0 requires Python 3.6+ - -matplotlib<3.1 # Matplotlib 3.1 requires Python 3.6 - -numpy<1.19.0 # numpy 1.19.0 drops support for Python 3.5 - -scipy<1.5.0 # scipy 1.5.0 drops support for Python 3.5 - -sympy<1.7.0 # sympy 1.7.0 drops support for Python 3.5 - -markupsafe<2.0.0 # markupsafe 2.0.0 requires Python >= 3.6 - -nltk<3.6.3 # nltk 3.6.3 drops support for Python 3.5 - -cryptography<3.3 # cryptography 3.3 has dropped python3.5 support. -PyJWT[crypto]<2.0.0 # PYJWT[crypto]==2.0.1 requires cryptography>=3.3.1 -social-auth-core<4.0.0 # social-auth-core>=4.0.0 requires PYJWT>=2.0.0 diff --git a/requirements/edx-sandbox/py35.in b/requirements/edx-sandbox/py35.in deleted file mode 100644 index e4d1a2184b..0000000000 --- a/requirements/edx-sandbox/py35.in +++ /dev/null @@ -1,36 +0,0 @@ -# Packages to install in the Python sandbox for secured execution of code provided by course authors. -# -# DON'T JUST ADD NEW DEPENDENCIES!!! -# -# If you open a pull request that adds a new dependency, you should: -# * verify that the dependency has a license compatible with AGPLv3 -# * confirm that it has no system requirements beyond what we already install -# * run "make upgrade" to update the detailed requirements files - -# We pin things specifically in this file beacuse we want to be very explicit about -# updating dependencies to the sandbox since they can impact how custom response code is run. -# We can then use constraints.txt to constrain any sub-dependencies that may need to be held back. - - --c ../constraints.txt --c py35-constraints.txt - - -chem # A helper library for chemistry calculations -cryptography # Implementations of assorted cryptography algorithms -lxml # XML parser -matplotlib==2.2.4 # 2D plotting library -networkx==2.2 # Utilities for creating, manipulating, and studying network graphs -nltk==3.6.2 # Natural language processing; used by the chem package -numpy==1.16.5 # Numeric array processing utilities; used by scipy -openedx-calc<2.0.0 -pyparsing==2.2.0 # Python Parsing module -random2 # Implementation of random module that works identically under Python 2 and 3 -scipy==1.2.1 # Math, science, and engineering library -sympy==1.6.2 # Symbolic math library - -# Install these packages from the edx-platform working tree -# NOTE: if you change code in these packages, you MUST change the version -# number in its setup.py or the code WILL NOT be installed during deploy. --e common/lib/sandbox-packages --e common/lib/symmath diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt deleted file mode 100644 index fe3e3da1be..0000000000 --- a/requirements/edx-sandbox/py35.txt +++ /dev/null @@ -1,110 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: -# -# make upgrade -# -common/lib/sandbox-packages - # via -r requirements/edx-sandbox/py35.in -common/lib/symmath - # via -r requirements/edx-sandbox/py35.in -cffi==1.15.0 - # via cryptography -chem==1.2.0 - # via -r requirements/edx-sandbox/py35.in -click==7.1.2 - # via - # -c requirements/edx-sandbox/../constraints.txt - # nltk -cryptography==3.2.1 - # via - # -c requirements/edx-sandbox/py35-constraints.txt - # -r requirements/edx-sandbox/py35.in -cycler==0.10.0 - # via matplotlib -decorator==5.1.0 - # via networkx -joblib==0.14.1 - # via - # -c requirements/edx-sandbox/py35-constraints.txt - # nltk -kiwisolver==1.1.0 - # via - # -c requirements/edx-sandbox/py35-constraints.txt - # matplotlib -lxml==4.5.0 - # via - # -c requirements/edx-sandbox/../constraints.txt - # -r requirements/edx-sandbox/py35.in -markupsafe==1.1.1 - # via - # -c requirements/edx-sandbox/py35-constraints.txt - # chem -matplotlib==2.2.4 - # via - # -c requirements/edx-sandbox/../constraints.txt - # -c requirements/edx-sandbox/py35-constraints.txt - # -r requirements/edx-sandbox/py35.in -mpmath==1.2.1 - # via sympy -networkx==2.2 - # via - # -c requirements/edx-sandbox/../constraints.txt - # -r requirements/edx-sandbox/py35.in -nltk==3.6.2 - # via - # -r requirements/edx-sandbox/py35.in - # chem -numpy==1.16.5 - # via - # -c requirements/edx-sandbox/py35-constraints.txt - # -r requirements/edx-sandbox/py35.in - # chem - # matplotlib - # openedx-calc - # scipy -openedx-calc==1.0.9 - # via -r requirements/edx-sandbox/py35.in -pycparser==2.20 - # via cffi -pyparsing==2.2.0 - # via - # -r requirements/edx-sandbox/py35.in - # chem - # matplotlib - # openedx-calc -python-dateutil==2.4.0 - # via - # -c requirements/edx-sandbox/../constraints.txt - # matplotlib -pytz==2021.3 - # via matplotlib -random2==1.0.1 - # via -r requirements/edx-sandbox/py35.in -regex==2021.10.8 - # via nltk -scipy==1.2.1 - # via - # -c requirements/edx-sandbox/py35-constraints.txt - # -r requirements/edx-sandbox/py35.in - # chem - # openedx-calc -six==1.16.0 - # via - # chem - # cryptography - # cycler - # matplotlib - # openedx-calc - # python-dateutil -sympy==1.6.2 - # via - # -c requirements/edx-sandbox/../constraints.txt - # -c requirements/edx-sandbox/py35-constraints.txt - # -r requirements/edx-sandbox/py35.in - # symmath -tqdm==4.62.3 - # via nltk - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/scripts/post-pip-compile.sh b/scripts/post-pip-compile.sh index 619d7951c7..a87faa5984 100755 --- a/scripts/post-pip-compile.sh +++ b/scripts/post-pip-compile.sh @@ -28,8 +28,7 @@ function clean_file { # Code sandbox local package installs must be non-editable due to file # permissions issues. edxapp ones must stay editable until assorted # packaging bugs are fixed. - if [[ "${FILE_PATH}" == "requirements/edx-sandbox/py35.txt" || - "${FILE_PATH}" == "requirements/edx-sandbox/py38.txt" ]]; then + if [[ "${FILE_PATH}" == "requirements/edx-sandbox/py38.txt" ]]; then sed "s|-e common/lib/|common/lib/|" ${FILE_PATH} > ${TEMP_FILE} mv ${TEMP_FILE} ${FILE_PATH} fi