mirror of
https://github.com/f-droid/fdroidserver.git
synced 2026-05-12 09:57:01 -04:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
3
setup.py
3
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',
|
||||
|
||||
Reference in New Issue
Block a user