8000 psycopg2 recipe fixes and doc, fixes #1405 · inclement/python-for-android@9465952 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9465952

Browse files
committed
psycopg2 recipe fixes and doc, fixes kivy#1405
Also replaced BROKEN_RECIPES_PYTHON3_CRYSTAX by BROKEN_RECIPES_PYTHON3 since our CI doesn't support Crystax anymore.
1 parent 81a1b6a commit 9465952

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ci/constants.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class TargetPython(Enum):
4545
'doubleratchet',
4646
'omemo',
4747
'cryptography',
48-
# https://github.com/kivy/python-for-android/issues/1405
48+
# requires `libpq-dev` system dependency e.g. for `pg_config` binary
4949
'psycopg2',
5050
'pygame',
5151
# most likely some setup in the Docker container, because it works in host
@@ -63,7 +63,7 @@ class TargetPython(Enum):
6363
'zeroconf',
6464
'zope',
6565
])
66-
BROKEN_RECIPES_PYTHON3_CRYSTAX = set([
66+
BROKEN_RECIPES_PYTHON3 = set([
6767
'brokenrecipe',
6868
# enum34 is not compatible with Python 3.6 standard library
6969
# https://stackoverflow.com/a/45716067/185510
@@ -83,8 +83,8 @@ class TargetPython(Enum):
8383
'icu',
8484
# https://github.com/kivy/python-for-android/issues/1354
8585
'kivent_core', 'kivent_cymunk', 'kivent_particles', 'kivent_polygen',
86-
# https://github.com/kivy/python-for-android/issues/1405
87-
'libpq', 'psycopg2',
86+
# requires `libpq-dev` system dependency e.g. for `pg_config` binary
87+
'psycopg2',
8888
'netifaces',
8989
# https://github.com/kivy/python-for-android/issues/1315 ?
9090
'opencv',
@@ -97,13 +97,9 @@ class TargetPython(Enum):
9797
'sympy',
9898
'vlc',
9999
])
100-
# to be created via https://github.com/kivy/python-for-android/issues/1514
101-
BROKEN_RECIPES_PYTHON3 = set([
102-
])
103100

104101
BROKEN_RECIPES = {
105102
TargetPython.python2: BROKEN_RECIPES_PYTHON2,
106-
TargetPython.python3crystax: BROKEN_RECIPES_PYTHON3_CRYSTAX,
107103
TargetPython.python3: BROKEN_RECIPES_PYTHON3,
108104
}
109105
# recipes that were already built will be skipped

pythonforandroid/recipes/psycopg2/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44

55

66
class Psycopg2Recipe(PythonRecipe):
7+
"""
8+
Requires `libpq-dev` system dependency e.g. for `pg_config` binary.
9+
"""
710
version = 'latest'
811
url = 'http://initd.org/psycopg/tarballs/psycopg2-{version}.tar.gz'
912
depends = ['libpq']
1013
site_packages_name = 'psycopg2'
14+
call_hostpython_via_targetpython = False
1115

1216
def prebuild_arch(self, arch):
1317
libdir = self.ctx.get_libs_dir(arch.arch)

0 commit comments

Comments
 (0)
0