From 4188baf851edc4a91c4bbdd73a2f92321ad7d662 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Mon, 20 Jan 2020 15:47:05 +0200 Subject: [PATCH] update requirements to use python3 --- installer/lib/requirements-debian-stretch.apt | 102 +++++++--------- installer/lib/requirements-ubuntu-bionic.apt | 113 ++++++++---------- installer/lib/requirements-ubuntu-xenial.apt | 113 ++++++++---------- ...uirements-ubuntu-xenial_docker_minimal.apt | 105 +++++++--------- 4 files changed, 180 insertions(+), 253 deletions(-) diff --git a/installer/lib/requirements-debian-stretch.apt b/installer/lib/requirements-debian-stretch.apt index c71175f6a..9e7f461bc 100644 --- a/installer/lib/requirements-debian-stretch.apt +++ b/installer/lib/requirements-debian-stretch.apt @@ -1,71 +1,53 @@ apache2 +coreutils +curl +ecasound +flac git +gstreamer1.0-plugins-ugly +icecast2 +lame +libao-ocaml libapache2-mod-php7.0 -php7.0 -php7.0-dev -php7.0-bcmath -php7.0-mbstring -php-pear -php7.0-gd -php-amqplib - -lsb-release - -zip -unzip - -rabbitmq-server - -postgresql -postgresql-client -php7.0-pgsql - -python -python-virtualenv -python-pip - +libcamomile-ocaml-data +libfaad2 +libmad-ocaml +libopus0 +libportaudio2 +libpulse0 +libsamplerate0 libsoundtouch-ocaml libtaglib-ocaml -libao-ocaml -libmad-ocaml -ecasound -libportaudio2 -libsamplerate0 libvo-aacenc0 - -python-rgain -python-gst-1.0 -gstreamer1.0-plugins-ugly -python-pika - -patch - -icecast2 - -curl -php7.0-curl -mpg123 - -libcamomile-ocaml-data -libpulse0 -vorbis-tools +liquidsoap +lsb-release lsb-release lsof -vorbisgain -flac -vorbis-tools -pwgen -libfaad2 +mpg123 +patch +php7.0 +php7.0-bcmath +php7.0-curl +php7.0-dev +php7.0-gd +php7.0-mbstring +php7.0-pgsql +php-amqplib php-apcu - -lame - -coreutils - -liquidsoap - -libopus0 - +php-pear +postgresql +postgresql-client +pwgen +python3 +python3-gst-1.0 +python3-pika +python3-pip +python3-virtualenv +rabbitmq-server systemd-sysv - +unzip +vorbisgain +vorbis-tools +vorbis-tools xmlstarlet +zip diff --git a/installer/lib/requirements-ubuntu-bionic.apt b/installer/lib/requirements-ubuntu-bionic.apt index 58be7819f..5487b09af 100644 --- a/installer/lib/requirements-ubuntu-bionic.apt +++ b/installer/lib/requirements-ubuntu-bionic.apt @@ -1,62 +1,25 @@ apache2 -libapache2-mod-php7.2 -php7.2 -php-pear -php7.2-gd -php-bcmath -php-mbstring - -lsb-release - -zip -unzip - -rabbitmq-server - -postgresql -postgresql-client -php7.2-pgsql - -python -python-virtualenv -python-pip - -libsoundtouch-ocaml -libtaglib-ocaml -libao-ocaml -libmad-ocaml -ecasound -libportaudio2 -libsamplerate0 - -python-rgain -python-gst-1.0 -gstreamer1.0-plugins-ugly -python-pika - -patch - -php7.2-curl -mpg123 -curl - -icecast2 - -libcamomile-ocaml-data -libpulse0 -vorbis-tools -lsof -vorbisgain -flac -vorbis-tools -pwgen -libfaad2 -php-apcu - -lame - +build-essential coreutils - +curl +ecasound +flac +gstreamer1.0-plugins-ugly +icecast2 +lame +libao-ocaml +libapache2-mod-php7.2 +libcamomile-ocaml-data +libfaad2 +libffi-dev +libmad-ocaml +libopus0 +libportaudio2 +libpulse0 +libsamplerate0 +libsoundtouch-ocaml +libssl-dev +libtaglib-ocaml liquidsoap liquidsoap-plugin-alsa liquidsoap-plugin-ao @@ -71,15 +34,33 @@ liquidsoap-plugin-pulseaudio liquidsoap-plugin-taglib liquidsoap-plugin-voaacenc liquidsoap-plugin-vorbis - +lsb-release +lsof +mpg123 +patch +php7.2 +php7.2-curl +php7.2-gd +php7.2-pgsql +php-apcu +php-bcmath +php-mbstring +php-pear +postgresql +postgresql-client +pwgen +python3 +python3-dev +python3-gst-1.0 +python3-pika +python3-pip +python3-virtualenv +rabbitmq-server silan -libopus0 - sysvinit-utils - -build-essential -libssl-dev -libffi-dev -python-dev - +unzip +vorbisgain +vorbis-tools +vorbis-tools xmlstarlet +zip diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt index 41381915f..a348b64a6 100644 --- a/installer/lib/requirements-ubuntu-xenial.apt +++ b/installer/lib/requirements-ubuntu-xenial.apt @@ -1,62 +1,25 @@ apache2 -libapache2-mod-php7.0 -php7.0 -php-pear -php7.0-gd -php-bcmath -php-mbstring - -lsb-release - -zip -unzip - -rabbitmq-server - -postgresql -postgresql-client -php7.0-pgsql - -python -python-virtualenv -python-pip - -libsoundtouch-ocaml -libtaglib-ocaml -libao-ocaml -libmad-ocaml -ecasound -libportaudio2 -libsamplerate0 - -python-rgain -python-gst-1.0 -gstreamer1.0-plugins-ugly -python-pika - -patch - -php7.0-curl -mpg123 -curl - -icecast2 - -libcamomile-ocaml-data -libpulse0 -vorbis-tools -lsof -vorbisgain -flac -vorbis-tools -pwgen -libfaad2 -php-apcu - -lame - +build-essential coreutils - +curl +ecasound +flac +gstreamer1.0-plugins-ugly +icecast2 +lame +libao-ocaml +libapache2-mod-php7.0 +libcamomile-ocaml-data +libfaad2 +libffi-dev +libmad-ocaml +libopus0 +libportaudio2 +libpulse0 +libsamplerate0 +libsoundtouch-ocaml +libssl-dev +libtaglib-ocaml liquidsoap liquidsoap-plugin-alsa liquidsoap-plugin-ao @@ -71,15 +34,33 @@ liquidsoap-plugin-pulseaudio liquidsoap-plugin-taglib liquidsoap-plugin-voaacenc liquidsoap-plugin-vorbis - +lsb-release +lsof +mpg123 +patch +php7.0 +php7.0-curl +php7.0-gd +php7.0-pgsql +php-apcu +php-bcmath +php-mbstring +php-pear +postgresql +postgresql-client +pwgen +python3 +python3-dev +python3-gst-1.0 +python3-pika +python3-pip +python3-virtualenv +rabbitmq-server silan -libopus0 - sysvinit-utils - -build-essential -libssl-dev -libffi-dev -python-dev - +unzip +vorbisgain +vorbis-tools +vorbis-tools xmlstarlet +zip diff --git a/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt b/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt index 09c94f817..8a05299e5 100644 --- a/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt +++ b/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt @@ -1,57 +1,24 @@ apache2 -libapache2-mod-php7.0 -php7.0 -php-pear -php7.0-gd -php-bcmath -php-mbstring - -lsb-release - -zip -unzip - -postgresql-client -php7.0-pgsql - -python -python-virtualenv -python-pip - -libsoundtouch-ocaml -libtaglib-ocaml -libao-ocaml -libmad-ocaml -ecasound -libportaudio2 -libsamplerate0 - -python-rgain -python-gst-1.0 -gstreamer1.0-plugins-ugly -python-pika - -patch - -php7.0-curl -mpg123 -curl - -libcamomile-ocaml-data -libpulse0 -vorbis-tools -lsof -vorbisgain -flac -vorbis-tools -pwgen -libfaad2 -php-apcu - -lame - +build-essential coreutils - +curl +ecasound +flac +gstreamer1.0-plugins-ugly +lame +libao-ocaml +libapache2-mod-php7.0 +libcamomile-ocaml-data +libfaad2 +libffi-dev +libmad-ocaml +libopus0 +libportaudio2 +libpulse0 +libsamplerate0 +libsoundtouch-ocaml +libssl-dev +libtaglib-ocaml liquidsoap liquidsoap-plugin-alsa liquidsoap-plugin-ao @@ -66,15 +33,31 @@ liquidsoap-plugin-pulseaudio liquidsoap-plugin-taglib liquidsoap-plugin-voaacenc liquidsoap-plugin-vorbis - +lsb-release +lsof +mpg123 +patch +php7.0 +php7.0-curl +php7.0-gd +php7.0-pgsql +php-apcu +php-bcmath +php-mbstring +php-pear +postgresql-client +pwgen +python3 +python3-dev +python3-gst-1.0 +python3-pika +python3-pip +python3-virtualenv silan -libopus0 - sysvinit-utils - -build-essential -libssl-dev -libffi-dev -python-dev - +unzip +vorbisgain +vorbis-tools +vorbis-tools xmlstarlet +zip