Skip to content

Commit

Permalink
Merge pull request #2221 from AndreMiras/feature/fix_on_device_tests
Browse files Browse the repository at this point in the history
🐛 Adds missing requests sub dependencies
  • Loading branch information
AndreMiras authored Jun 2, 2020
2 parents 5affb70 + f5e0855 commit 46d14e9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ testapps-with-numpy/%: virtualenv
$(eval $@_APP_ARCH := $(shell basename $*))
. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
--requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools,numpy \
--requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,urllib3,chardet,idna,sqlite3,setuptools,numpy \
--arch=$($@_APP_ARCH)

testapps/%: virtualenv
Expand Down
2 changes: 1 addition & 1 deletion doc/source/troubleshooting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ Remember to always clean the build before rebuilding (`p4a clean builds`, or wit

On Ubuntu and derivatives::

apt install openssl
apt install libssl-dev
p4a clean builds # or with: buildozer `buildozer android clean

On macOS::
Expand Down
6 changes: 4 additions & 2 deletions testapps/on_device_unit_tests/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
app requirements via the dictionary `options`. Here you have some examples
to build the supported app modes::
- kivy *basic*: `sqlite3,libffi,openssl,pyjnius,kivy,python3,requests`
- kivy *basic*: `sqlite3,libffi,openssl,pyjnius,kivy,python3,requests,
urllib3,chardet,idna`
- kivy *images/graphs*: `kivy,python3,numpy,matplotlib,Pillow`
- kivy *encryption*: `kivy,python3,cryptography,pycryptodome,scrypt,
m2crypto,pysha3`
Expand All @@ -39,7 +40,8 @@
'apk':
{
'requirements':
'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests',
'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests,urllib3,'
'chardet,idna',
'android-api': 27,
'ndk-api': 21,
'dist-name': 'bdist_unit_tests_app',
Expand Down

0 comments on commit 46d14e9

Please sign in to comment.