From f5ca20ed3e5e379efe6c24219ef60180b627da42 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Thu, 15 Jul 2021 10:27:23 +0200 Subject: [PATCH] install pycairo before PyGObject Fixes: #1267 --- install | 3 +++ python_apps/airtime_analyzer/setup.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install b/install index a0e5553b4..28e9b13b5 100755 --- a/install +++ b/install @@ -970,6 +970,9 @@ verbose "Detected Python version: $python_version" verbose "\n * Installing necessary python services..." loudCmd "$python_bin -mpip install setuptools --upgrade" +# Required here because PyGObject requires it, but it is installed after PyGObject +# when pip parses the setup.py file in airtime_analyzer +loudCmd "$python_bin -mpip install pycairo==1.19.1" verbose "...Done" verbose "\n * Creating /run/airtime..." diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py index 4c62ee86f..6f9b28acb 100644 --- a/python_apps/airtime_analyzer/setup.py +++ b/python_apps/airtime_analyzer/setup.py @@ -24,8 +24,8 @@ setup( "file-magic", "requests>=2.7.0", "rgain3==1.1.0", - # 3.36.1 is the latest version that does not fail to find py3cairo package - "PyGObject>=3.34.0,<=3.36.1", + "PyGObject>=3.34.0", + # If this version is changed, it needs changing in the install script too "pycairo==1.19.1", ], zip_safe=False,