From a5023d031ac1d603ce3c0ff779812ff1c4944514 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Mon, 16 Nov 2020 14:38:25 -0500 Subject: [PATCH] pin PyGObject versions to distro provided packages this prevents pip trying to build the pypi package and failing. Fixes: #1107 --- installer/lib/requirements-debian-buster.apt | 6 ++++++ installer/lib/requirements-ubuntu-bionic.apt | 11 +++++++++-- installer/lib/requirements-ubuntu-xenial.apt | 8 ++++++++ python_apps/airtime_analyzer/setup.py | 6 ++++-- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/installer/lib/requirements-debian-buster.apt b/installer/lib/requirements-debian-buster.apt index 7438d1e0f..9166faca7 100644 --- a/installer/lib/requirements-debian-buster.apt +++ b/installer/lib/requirements-debian-buster.apt @@ -4,6 +4,8 @@ curl ecasound flac git +gcc +gir1.2-gtk-3.0 gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly @@ -14,6 +16,8 @@ libapache2-mod-php7.3 libcairo2-dev libcamomile-ocaml-data libfaad2 +libglib2.0-dev +libgirepository1.0-dev libmad-ocaml libopus0 libportaudio2 @@ -43,6 +47,8 @@ postgresql postgresql-client pwgen python3 +python3-gi +python3-gi-cairo python3-gst-1.0 python3-pika python3-pip diff --git a/installer/lib/requirements-ubuntu-bionic.apt b/installer/lib/requirements-ubuntu-bionic.apt index 0254b3d3c..44cf18b4e 100644 --- a/installer/lib/requirements-ubuntu-bionic.apt +++ b/installer/lib/requirements-ubuntu-bionic.apt @@ -4,6 +4,8 @@ coreutils curl ecasound flac +gcc +gir1.2-gtk-3.0 gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly @@ -11,9 +13,12 @@ icecast2 lame libao-ocaml libapache2-mod-php7.2 +libcairo2-dev libcamomile-ocaml-data libfaad2 libffi-dev +libglib2.0-dev +libgirepository1.0-dev libmad-ocaml libopus0 libportaudio2 @@ -48,22 +53,24 @@ php-apcu php-bcmath php-mbstring php-pear +pkg-config postgresql postgresql-client pwgen python3 +python3-cairo python3-dev +python3-gi +python3-gi-cairo python3-gst-1.0 python3-pika python3-pip python3-virtualenv -python3-cairo rabbitmq-server silan sysvinit-utils 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 df64d2fd2..48d97befa 100644 --- a/installer/lib/requirements-ubuntu-xenial.apt +++ b/installer/lib/requirements-ubuntu-xenial.apt @@ -4,6 +4,8 @@ coreutils curl ecasound flac +gcc +gir1.2-gtk-3.0 gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly @@ -12,8 +14,11 @@ lame libao-ocaml libapache2-mod-php7.0 libcamomile-ocaml-data +libcairo2-dev libfaad2 libffi-dev +libglib2.0-dev +libgirepository1.0-dev libmad-ocaml libopus0 libportaudio2 @@ -48,11 +53,14 @@ php-apcu php-bcmath php-mbstring php-pear +pkg-config postgresql postgresql-client pwgen python3 python3-dev +python3-gi +python3-gi-cairo python3-gst-1.0 python3-pika python3-pip diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py index 186c10fc1..7645fa9ac 100644 --- a/python_apps/airtime_analyzer/setup.py +++ b/python_apps/airtime_analyzer/setup.py @@ -29,7 +29,7 @@ setup(name='airtime_analyzer', packages=['airtime_analyzer'], scripts=['bin/airtime_analyzer'], install_requires=[ - 'mutagen~=1.43', + 'mutagen==1.42.0', 'pika~=1.1.0', 'file-magic', 'nose', @@ -37,7 +37,9 @@ setup(name='airtime_analyzer', 'mock', 'python-daemon', 'requests>=2.7.0', - 'rgain3', + 'rgain3==1.0.0', + 'pycairo==1.19.1', + 'PyGObject<=3.36.1', # These next 3 are required for requests to support SSL with SNI. Learned this the hard way... # What sucks is that GCC is required to pip install these. #'ndg-httpsclient',