From a5023d031ac1d603ce3c0ff779812ff1c4944514 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Mon, 16 Nov 2020 14:38:25 -0500 Subject: [PATCH 01/13] 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', From a7690adf0b371cabcead92df14030baf4b968e04 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 13:00:47 -0500 Subject: [PATCH 02/13] Fixing issues with Travis CI --- .travis.yml | 14 +++++--------- docs/_config.yml | 2 ++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d05bf1451..c3da88cc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: bionic services: - postgresql @@ -23,6 +23,10 @@ addons: - liquidsoap-plugin-vorbis - python3-gst-1.0 - silan + - python3-gi + - python3-gi-cairo + - gcc + - gir1.2-gtk-3.0 jobs: include: @@ -32,15 +36,9 @@ jobs: - language: php php: 7.2 stage: test - - language: php - php: 7.1 - stage: test - language: php php: 7.0 stage: test - - language: php - php: 5.6 - stage: test - language: python python: 3.8 stage: test @@ -70,8 +68,6 @@ jobs: php: 7.3 - language: php php: 7.2 - - language: php - php: 7.1 # https://github.com/LibreTime/libretime/issues/1041 - language: python python: 3.5 diff --git a/docs/_config.yml b/docs/_config.yml index 09770b95e..0ae25cec2 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -10,6 +10,8 @@ includes_dir: _includes favicon: favicon.ico +exclude: ['jekyll.sh' +] # For splash page layout only headimage: img/header.jpg headtext: Open Source Radio Automation From 8d44ea848085cc7b4fac1a2bbbd7ea1a55dcf054 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 13:43:18 -0500 Subject: [PATCH 03/13] Adding back tests for @paddatrapper --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index c3da88cc1..f041608d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,9 +36,15 @@ jobs: - language: php php: 7.2 stage: test + - language: php + php: 7.1 + stage: test - language: php php: 7.0 stage: test + - language: php + php: 5.6 + stage: test - language: python python: 3.8 stage: test @@ -68,6 +74,8 @@ jobs: php: 7.3 - language: php php: 7.2 + - language: php + php: 7.1 # https://github.com/LibreTime/libretime/issues/1041 - language: python python: 3.5 From 4e2fdb9bd1d21d34e9da2e5be601757d5184eae5 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 13:49:03 -0500 Subject: [PATCH 04/13] Move Jekyll script --- docs/_config.yml | 2 -- docs/jekyll.sh => jekyll.sh | 0 2 files changed, 2 deletions(-) rename docs/jekyll.sh => jekyll.sh (100%) diff --git a/docs/_config.yml b/docs/_config.yml index 0ae25cec2..09770b95e 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -10,8 +10,6 @@ includes_dir: _includes favicon: favicon.ico -exclude: ['jekyll.sh' -] # For splash page layout only headimage: img/header.jpg headtext: Open Source Radio Automation diff --git a/docs/jekyll.sh b/jekyll.sh similarity index 100% rename from docs/jekyll.sh rename to jekyll.sh From 384435964d5fea905e79ea82557498b8c32576c1 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 14:09:50 -0500 Subject: [PATCH 05/13] Modifying Jekyll install script --- jekyll.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jekyll.sh b/jekyll.sh index 75b0ddf00..768f29a8d 100644 --- a/jekyll.sh +++ b/jekyll.sh @@ -3,7 +3,7 @@ # someone to use to get Jekyll building outside of GitHub echo "Installing Ruby" -sudo apt-get install ruby-full build-essential zlib1g-dev +apt-get install -y ruby-full build-essential zlib1g-dev export GEM_HOME=".gems" export PATH=".gems/bin:$PATH" @@ -13,6 +13,4 @@ cd docs gem install jekyll bundler # Running Jekyll -bundle exec jekyll serve --watch --port 8888 - -echo "Visit http://localhost:8888 to see the LibreTime website." +jekyll serve From 388733ffa349fe515c6d2626f3b089d7d7e10ef3 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 14:12:39 -0500 Subject: [PATCH 06/13] :'( @paddatrapper --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f041608d7..d05bf1451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: bionic +dist: xenial services: - postgresql @@ -23,10 +23,6 @@ addons: - liquidsoap-plugin-vorbis - python3-gst-1.0 - silan - - python3-gi - - python3-gi-cairo - - gcc - - gir1.2-gtk-3.0 jobs: include: From 852cf63834a2f5655076d262e4ea0abd1d17f33a Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 14:16:29 -0500 Subject: [PATCH 07/13] Giving Jekyll a place in Vagrantfile --- Vagrantfile | 4 +++- jekyll.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6fd580319..3125f1435 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,6 +10,8 @@ Vagrant.configure("2") do |config| # liquidsoap input harbors for instreaming (ie. /master) config.vm.network "forwarded_port", guest: 8001, host:8001 config.vm.network "forwarded_port", guest: 8002, host:8002 + # for Jekyll serve + config.vm.network "forwarded_port", guest: 8888, host:8888 # make sure we are using nfs (doesn't work out of the box with debian) nfsPath = "." @@ -69,7 +71,7 @@ Vagrant.configure("2") do |config| config.vm.provision "install", type: "shell", inline: "cd /vagrant; ./install %s --web-port=8080" % installer_args # Provision docs - config.vm.provision "build-site-jekyll", type: "shell", path: "docs/jekyll.sh" + config.vm.provision "build-site-jekyll", type: "shell", path: "./jekyll.sh" end end diff --git a/jekyll.sh b/jekyll.sh index 768f29a8d..1a058a4f4 100644 --- a/jekyll.sh +++ b/jekyll.sh @@ -13,4 +13,4 @@ cd docs gem install jekyll bundler # Running Jekyll -jekyll serve +jekyll serve --port 8888 From e84fe4b67f9048ab3372fc317c286ecdf14f9483 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 14:18:27 -0500 Subject: [PATCH 08/13] Automating apt update - works --- jekyll.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.sh b/jekyll.sh index 1a058a4f4..c02e5f868 100644 --- a/jekyll.sh +++ b/jekyll.sh @@ -3,7 +3,7 @@ # someone to use to get Jekyll building outside of GitHub echo "Installing Ruby" -apt-get install -y ruby-full build-essential zlib1g-dev +apt-get update -y && apt-get install -y ruby-full build-essential zlib1g-dev export GEM_HOME=".gems" export PATH=".gems/bin:$PATH" From 650d635d98e531e713c4196b00a59d058b324e16 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 15:03:40 -0500 Subject: [PATCH 09/13] Fixing issue with Vagrant --- jekyll.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jekyll.sh b/jekyll.sh index c02e5f868..ea117e27d 100644 --- a/jekyll.sh +++ b/jekyll.sh @@ -9,7 +9,16 @@ export GEM_HOME=".gems" export PATH=".gems/bin:$PATH" echo "Installing Jekyll" -cd docs + +# Picking different directory if installing with Vagrant +localUser=$(who am i | awk '{print $1}') +if [ $localUser == vagrant ] +then + cd /vagrant/docs +else + cd docs +fi + gem install jekyll bundler # Running Jekyll From f0901b56361574d4363bfac29c417bd746a7ac1d Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 15:42:22 -0500 Subject: [PATCH 10/13] Specifying hostname for build --- jekyll.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.sh b/jekyll.sh index ea117e27d..ff9fda15c 100644 --- a/jekyll.sh +++ b/jekyll.sh @@ -22,4 +22,4 @@ fi gem install jekyll bundler # Running Jekyll -jekyll serve --port 8888 +jekyll serve --port 8888 --host 0.0.0.0 From dc57d08bd552631db08495c894890b40032d520d Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 16:37:35 -0500 Subject: [PATCH 11/13] Removing Jekyll from Vagrant --- Vagrantfile | 5 ----- jekyll.sh | 16 +++------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3125f1435..19650274e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,8 +10,6 @@ Vagrant.configure("2") do |config| # liquidsoap input harbors for instreaming (ie. /master) config.vm.network "forwarded_port", guest: 8001, host:8001 config.vm.network "forwarded_port", guest: 8002, host:8002 - # for Jekyll serve - config.vm.network "forwarded_port", guest: 8888, host:8888 # make sure we are using nfs (doesn't work out of the box with debian) nfsPath = "." @@ -69,9 +67,6 @@ Vagrant.configure("2") do |config| # Provision LibreTime config.vm.provision "install", type: "shell", inline: "cd /vagrant; ./install %s --web-port=8080" % installer_args - - # Provision docs - config.vm.provision "build-site-jekyll", type: "shell", path: "./jekyll.sh" end end diff --git a/jekyll.sh b/jekyll.sh index ff9fda15c..aa8af1ab0 100644 --- a/jekyll.sh +++ b/jekyll.sh @@ -1,6 +1,4 @@ -# Installing Jekyll -# This script does not work and exists as a skeleton for -# someone to use to get Jekyll building outside of GitHub +#/bin/bash echo "Installing Ruby" apt-get update -y && apt-get install -y ruby-full build-essential zlib1g-dev @@ -10,16 +8,8 @@ export PATH=".gems/bin:$PATH" echo "Installing Jekyll" -# Picking different directory if installing with Vagrant -localUser=$(who am i | awk '{print $1}') -if [ $localUser == vagrant ] -then - cd /vagrant/docs -else - cd docs -fi - +cd docs gem install jekyll bundler # Running Jekyll -jekyll serve --port 8888 --host 0.0.0.0 +jekyll serve From 2458b3edcd50dfce161dfcef495fab04667b0323 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 16:41:29 -0500 Subject: [PATCH 12/13] Updating .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 70c7c2d12..fb7037ec1 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ airtime_mvc/tests/log/*.log .DS_Store .idea/ /docs/_site/* -/docs/.jekyll-cache/* \ No newline at end of file +/docs/.jekyll-cache/* +/docs/.gems/* \ No newline at end of file From 417fe3d39690a3ecd5150a50d2f27fd2d1a793da Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Thu, 19 Nov 2020 00:00:19 +0200 Subject: [PATCH 13/13] bump kramdown dependency version --- docs/gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/gemfile b/docs/gemfile index d7d8ce461..818cd8f50 100644 --- a/docs/gemfile +++ b/docs/gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'kramdown', '~> 2.2', '>= 2.2.1' +gem 'kramdown', '>= 2.3.0' -gem 'jekyll', '~> 4.1' \ No newline at end of file +gem 'jekyll', '~> 4.1'