diff --git a/build_deb.sh b/build_deb.sh index 12983c6ab7cd89dffb38717d72456df7d7b8726f..48a3aafaa294c536d2a0b7fb32f0315fc502a09f 100644 --- a/build_deb.sh +++ b/build_deb.sh @@ -28,6 +28,7 @@ echo "UPLOAD_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)),'../ echo "SECRET_KEY ='tmp'" >> smash/local_settings.py echo "STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'" >> smash/local_settings.py npm install +export PYTHONDONTWRITEBYTECODE=1 ./manage.py collectstatic rm -rf node_modules mv tmp-static/npm node_modules diff --git a/debian-files/smasch.py b/debian-files/smasch.py index f3280119cae87656cc144e444ce859b50c751120..80f457e582225b92de18c1547f131957a41b2547 100644 --- a/debian-files/smasch.py +++ b/debian-files/smasch.py @@ -58,3 +58,4 @@ LOGGING = { } TWO_FACTOR_SMS_GATEWAY = "web.nexmo_gateway.Nexmo" +NPM_ROOT_PATH = '/usr/lib/smasch/' diff --git a/debian-template/postinst b/debian-template/postinst index 3994404ade00b3db778141e69a1f5b5ff4190e88..c6f237ddcdbee5217f65bbb0896239ba1ae2bcfe 100644 --- a/debian-template/postinst +++ b/debian-template/postinst @@ -26,8 +26,8 @@ fi echo "Installing python dependencies" { - source /usr/lib/smasch/env/bin/activate && pip install -r --use-deprecated=legacy-resolver /usr/lib/smasch/requirements.txt --log $LOG_FILE - source /usr/lib/smasch/env/bin/activate && pip install -r --use-deprecated=legacy-resolver /usr/lib/smasch/requirements-dev.txt --log $LOG_FILE + source /usr/lib/smasch/env/bin/activate && pip install -r /usr/lib/smasch/requirements.txt --log $LOG_FILE + source /usr/lib/smasch/env/bin/activate && pip install -r /usr/lib/smasch/requirements-dev.txt --log $LOG_FILE } || { echo "There was an issue when installing python dependencies." >> $LOG_FILE echo "There was an issue when installing python dependencies. Reinstall of smasch could help (in case you are upgrading smasch the data should not be lost in the process): "