From 1b0fabe8f552eb60a9515367d54bfe7a47e0c476 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 25 Nov 2024 11:57:41 +0100
Subject: [PATCH] install biplist and pycountry by default on macOS

* biplist is only used for Apple iOS IPA files.
* pycountry is only used for linting countryCodes in mirror configs.

Both of these are included via the Debian packaging, where those packages
and updates are more vetted.  Homebrew for macOS makes it very difficult to
include optional dependencies, so this includes the optional dependencies
via distutils' method.
---
 .gitlab-ci.yml | 3 ---
 setup.py       | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48f62c4a..27455c75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -392,9 +392,6 @@ macOS:
     - /bin/bash --version
     - /bin/bash -n gradlew-fdroid tests/run-tests
 
-    # TODO remove the packages below once they are included in the Homebrew package
-    - $(brew --prefix fdroidserver)/libexec/bin/python3 -m pip install biplist oscrypto pycountry
-
     # test fdroidserver from git with current package's dependencies
     - fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests
 
diff --git a/setup.py b/setup.py
index 99fbe0fb..f45d5b81 100755
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,8 @@ setup(
         'platformdirs',
         'androguard >= 3.3.5',
         'asn1crypto',
+        # TODO use biplist on all platforms once IPA support is stable
+        'biplist ; sys_platform=="darwin"',
         'clint',
         'defusedxml',
         'GitPython',
@@ -101,6 +103,7 @@ setup(
         'Pillow',
         'apache-libcloud >= 0.14.1',
         'puremagic',
+        'pycountry ; sys_platform=="darwin"',
         'python-vagrant',
         'PyYAML',
         'qrcode',