mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'optional-deps-for-macOS' into 'master'

Browse source 
install biplist and pycountry by default on macOS

See merge request fdroid/fdroidserver!1569
This commit is contained in:
Jochen Sprickerhof 2024-11-25 14:39:34 +00:00
commit 67e27cc706
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -392,9 +392,6 @@ macOS:
- /bin/bash --version - /bin/bash --version
- /bin/bash -n gradlew-fdroid tests/run-tests - /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 # test fdroidserver from git with current package's dependencies
- fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests - fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests

3
setup.py
View file

@ -93,6 +93,8 @@ setup(
'platformdirs', 'platformdirs',
'androguard >= 3.3.5', 'androguard >= 3.3.5',
'asn1crypto', 'asn1crypto',
# TODO use biplist on all platforms once IPA support is stable
'biplist ; sys_platform=="darwin"',
'clint', 'clint',
'defusedxml', 'defusedxml',
'GitPython', 'GitPython',
@ -101,6 +103,7 @@ setup(
'Pillow', 'Pillow',
'apache-libcloud >= 0.14.1', 'apache-libcloud >= 0.14.1',
'puremagic', 'puremagic',
'pycountry ; sys_platform=="darwin"',
'python-vagrant', 'python-vagrant',
'PyYAML', 'PyYAML',
'qrcode', 'qrcode',