Carlos muniz/symmath removal unrevert (#29912)
* Revert "Merge pull request #29909 from openedx/revert-29869-Carlos-Muniz/symmath-removal" This reverts commit8c0db8ddff, reversing changes made to1156c62014. * fix: Remove misplaced `-e` `-e` was wrongfully placed in front of `common/lib/sandbox-packages`, which may have most likely been causing the edxAPP to break. * fix: Change regex to apply to right dirs `py38.txt` does not include `common/lib/xmodule` so it doesn't match the regex. Therefore, it never got its lines in `common/lib/sandbox-packages` fixed. If we change the regex to match any `common/lib/<packagename>` it should work correctly.
This commit is contained in:
@@ -17,7 +17,7 @@ function clean_file {
|
||||
# Workaround for https://github.com/jazzband/pip-tools/issues/204 -
|
||||
# change absolute paths for local editable packages back to relative ones
|
||||
FILE_CONTENT=$(<${FILE_PATH})
|
||||
FILE_URL_REGEX="-e (file:///[^"$'\n'"]*)/common/lib/symmath"
|
||||
FILE_URL_REGEX="-e (file:///[^"$'\n'"]*)/common/lib/\w+"
|
||||
if [[ "${FILE_CONTENT}" =~ ${FILE_URL_REGEX} ]]; then
|
||||
BASE_FILE_URL=${BASH_REMATCH[1]}
|
||||
sed "s|$BASE_FILE_URL/||" ${FILE_PATH} > ${TEMP_FILE}
|
||||
|
||||
@@ -38,7 +38,7 @@ exclude+='|^common/test/data/?.*$'
|
||||
# * common/lib/xmodule -> EXCLUDE from check.
|
||||
# * common/lib/xmodule/xmodule/modulestore -> INCLUDE in check.
|
||||
exclude+='|^common/lib$'
|
||||
exclude+='|^common/lib/(capa|safe_lxml|sandbox-packages|symmath|xmodule)$'
|
||||
exclude+='|^common/lib/(capa|safe_lxml|sandbox-packages|xmodule)$'
|
||||
|
||||
# Docs, scripts.
|
||||
exclude+='|^docs/.*$'
|
||||
|
||||
Reference in New Issue
Block a user