From 881943a0db430db07c4ad33f8bad73b00f5ab121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael@poehn.at>
Date: Sat, 30 Dec 2023 00:06:16 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=94=20install=20biplist=20for=20ci=20t?=
 =?UTF-8?q?ests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

biplist is an optional python dependency required for processing iOS
apps. (.ipa files)
---
 .gitlab-ci.yml | 6 +++---
 setup.py       | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 188a2b90..00fd097c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ buildserver run-tests:
   image: registry.gitlab.com/fdroid/fdroidserver:buildserver
   script:
     - apt-get update
-    - apt-get install gnupg-agent python3-babel python3-clint python3-pycountry
+    - apt-get install gnupg-agent python3-babel python3-biplist python3-clint python3-pycountry
     - ./tests/run-tests
     # make sure that translations do not cause stacktraces
     - cd $CI_PROJECT_DIR/locale
@@ -154,8 +154,8 @@ ubuntu_jammy_pip:
     - $pip install sdkmanager
     - sdkmanager 'build-tools;33.0.0'
 
-    # pycountry is only for linting config/mirrors.yml, so its not in setup.py
-    - $pip install pycountry
+    # Install extras_require.optional from setup.py
+    - $pip install biplist pycountry
 
     - $pip install dist/fdroidserver-*.tar.gz
     - tar xzf dist/fdroidserver-*.tar.gz
diff --git a/setup.py b/setup.py
index 522c3377..afff96b4 100755
--- a/setup.py
+++ b/setup.py
@@ -108,7 +108,11 @@ setup(
         'sdkmanager >= 0.6.4',
         'yamllint',
     ],
+    # Some requires are only needed for very limited cases:
+    # * biplist is only used for parsing Apple .ipa files
+    # * pycountry is only for linting config/mirrors.yml
     extras_require={
+        'optional': ['biplist', 'pycountry'],
         'test': ['pyjks', 'html5print'],
         'docs': [
             'sphinx',