Skip to content

Commit 006e75e

Browse files
committed
Add python3 test for sqlite and openssl and add python3's compatibility to dependant recipes
To be able to run successfully the new test we must add python3 compatibility to some recipes that is why we touch them here.
1 parent 903207d commit 006e75e

File tree

4 files changed

+33
-4
lines changed

4 files changed

+33
-4
lines changed

pythonforandroid/recipes/requests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class RequestsRecipe(PythonRecipe):
55
version = '2.13.0'
66
url = 'https://github.com/kennethreitz/requests/archive/v{version}.tar.gz'
7-
depends = [('hostpython2', 'hostpython3crystax'), 'setuptools']
7+
depends = [('python2', 'python3', 'python3crystax'), 'setuptools']
88
site_packages_name = 'requests'
99
call_hostpython_via_targetpython = False
1010

pythonforandroid/recipes/setuptools/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class SetuptoolsRecipe(PythonRecipe):
55
version = '40.0.0'
66
url = 'https://pypi.python.org/packages/source/s/setuptools/setuptools-{version}.zip'
77

8-
depends = [('python2', 'python3crystax')]
8+
depends = [('python2', 'python3', 'python3crystax')]
99

1010
call_hostpython_via_targetpython = False
1111
install_in_hostpython = True

testapps/setup_testapp_python2_sqlite_openssl.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
'ndk-dir': '/home/sandy/android/crystax-ndk-10.3.2',
99
'dist-name': 'bdisttest_python2_sqlite_openssl',
1010
'ndk-version': '10.3.2',
11-
'permission': 'VIBRATE',
12-
'permission': 'INTERNET',
11+
'permissions': ['INTERNET', 'VIBRATE'],
1312
'arch': 'armeabi-v7a',
1413
'window': None,
1514
}}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
from distutils.core import setup
3+
from setuptools import find_packages
4+
5+
options = {'apk': {'requirements': 'libffi,openssl,sqlite3,requests,peewee,sdl2,pyjnius,kivy,python3',
6+
'android-api': 27,
7+
'ndk-api': 21,
8+
'dist-name': 'bdisttest_python3_sqlite_openssl_googlendk',
9+
'ndk-version': '10.3.2',
10+
'arch': 'armeabi-v7a',
11+
'permissions': ['INTERNET', 'VIBRATE'],
12+
}}
13+
14+
package_data = {'': ['*.py',
15+
'*.png']
16+
}
17+
18+
packages = find_packages()
19+
print('packages are', packages)
20+
21+
setup(
22+
name='testapp_python3_sqlite_openssl_googlendk',
23+
version='1.1',
24+
description='p4a setup.py test',
25+
author='Alexander Taylor',
26+
author_email='[email protected]',
27+
packages=find_packages(),
28+
options=options,
29+
package_data={'testapp_sqlite_openssl': ['*.py', '*.png']}
30+
)

0 commit comments

Comments
 (0)