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',