Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert 77315885b9 

And remove prod extra requires for api because ./setup.py install
don't handle extra requires.
This commit is contained in:
jo 2021-09-17 07:23:26 +02:00
parent 7731197c46
commit aad92c4ac1
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/setup.py
View File

@ -28,11 +28,10 @@ setup(
"django-url-filter", "django-url-filter",
"markdown", "markdown",
"model_bakery", "model_bakery",
"psycopg2", # TODO: Move to prod requires
], ],
extras_require={ extras_require={
"prod": [ "prod": [],
"psycopg2",
],
"dev": [ "dev": [
"psycopg2-binary", "psycopg2-binary",
], ],

10
install
View File

@ -1023,11 +1023,11 @@ if [ ! -d /var/log/airtime ]; then
fi fi
verbose "\n * Installing API client..." verbose "\n * Installing API client..."
loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/api_clients" loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/api_clients/setup.py install --install-scripts=/usr/bin"
verbose "...Done" verbose "...Done"
verbose "\n * Installing pypo and liquidsoap..." verbose "\n * Installing pypo and liquidsoap..."
loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/pypo" --install-option="--install-scripts=/usr/bin" loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/pypo/setup.py install --install-scripts=/usr/bin"
loudCmd "mkdir -p /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/" loudCmd "mkdir -p /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
loudCmd "chown -R ${web_user}:${web_user} /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/" loudCmd "chown -R ${web_user}:${web_user} /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
systemInitInstall libretime-liquidsoap "$web_user" systemInitInstall libretime-liquidsoap "$web_user"
@ -1035,7 +1035,7 @@ systemInitInstall libretime-playout "$web_user"
verbose "...Done" verbose "...Done"
verbose "\n * Installing airtime-celery..." verbose "\n * Installing airtime-celery..."
loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/airtime-celery" loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/airtime-celery/setup.py install"
# Create the Celery user # Create the Celery user
if $is_centos_dist; then if $is_centos_dist; then
loudCmd "id celery 2>/dev/null || adduser --no-create-home -c 'LibreTime Celery' -r celery || true" loudCmd "id celery 2>/dev/null || adduser --no-create-home -c 'LibreTime Celery' -r celery || true"
@ -1051,12 +1051,12 @@ systemInitInstall libretime-celery
verbose "...Done" verbose "...Done"
verbose "\n * Installing libretime-analyzer..." verbose "\n * Installing libretime-analyzer..."
loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/airtime_analyzer" --install-option="--install-scripts=/usr/bin" loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin"
systemInitInstall libretime-analyzer "$web_user" systemInitInstall libretime-analyzer "$web_user"
verbose "...Done" verbose "...Done"
verbose "\n * Installing API..." verbose "\n * Installing API..."
loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/api[prod]" loudCmd "python3 ${AIRTIMEROOT}/api/setup.py install --install-scripts=/usr/bin"
systemInitInstall libretime-api "$web_user" systemInitInstall libretime-api "$web_user"
mkdir -p /etc/airtime mkdir -p /etc/airtime
sed -e "s@WEB_USER@${web_user}@g" \ sed -e "s@WEB_USER@${web_user}@g" \