Switch make upgrade to Python 3.5 (#22609)

* Switch make upgrade to Python 3.5

* bok-choy fixes, constrain django-debug-toolbar

* Remove flaky bok-choy test
This commit is contained in:
Jeremy Bowman
2019-12-26 15:13:02 -05:00
committed by GitHub
parent 10cc7895bd
commit b2046f6674
22 changed files with 142 additions and 225 deletions

View File

@@ -28,7 +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/base.txt" ]]; then
if [[ "${FILE_PATH}" == "requirements/edx-sandbox/py35.txt" ]]; then
sed "s|-e common/lib/|common/lib/|" ${FILE_PATH} > ${TEMP_FILE}
mv ${TEMP_FILE} ${FILE_PATH}
fi

View File

@@ -1,21 +0,0 @@
#!/bin/bash
# First, check to see if the pysqlite version has already been upgraded. If so, no installation is needed.
# The pip-installed version of pysqlite has a sqlite_version of "3.11.0".
sqlite_version=`python -c "from pysqlite2._sqlite import sqlite_version; print sqlite_version"`
if [ $sqlite_version = "3.14.1" ]; then
exit 0
fi
# Upgrade the version of pysqlite/sqlite to avoid crashes during testing.
# Ideally, this code would just install a pre-built wheel - change it to this
# once edX has its own artifact server.
pip uninstall -y pysqlite
rm -rf tmp_pysqlite_upgrade && mkdir -p tmp_pysqlite_upgrade && cd tmp_pysqlite_upgrade
curl -o 2.8.3.tar.gz https://codeload.github.com/ghaering/pysqlite/tar.gz/2.8.3
curl -o sqlite-autoconf-3140100.tar.gz https://www.sqlite.org/2016/sqlite-autoconf-3140100.tar.gz
tar -xzvf sqlite-autoconf-3140100.tar.gz
tar -xzvf 2.8.3.tar.gz
cp -av sqlite-autoconf-3140100/. pysqlite-2.8.3/
cd ./pysqlite-2.8.3 && python setup.py build_static install
cd ../.. && rm -rf tmp_pysqlite_upgrade