Skip to content

Commit 6c5b7bf

Browse files
committed
android build: build p4a recipes with --no-isolation
the core change is spesmilo/python-for-android@8c0fcc9 the rest here just follow that
1 parent f985656 commit 6c5b7bf

6 files changed

Lines changed: 34 additions & 4 deletions

File tree

contrib/android/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ RUN cd /opt \
234234
&& /opt/venv/bin/python3 -m pip install --no-build-isolation --no-dependencies -e .
235235

236236
# install python-for-android
237-
ENV P4A_CHECKOUT_COMMIT="1098be6964cfc2156959e435e81c2c50f8398586"
237+
ENV P4A_CHECKOUT_COMMIT="8c0fcc9ef2e559918ca96ecde6e09fe521bb1427"
238238
# ^ from branch electrum_202602 (note: careful with force-pushing! see #8162)
239239
RUN cd /opt \
240240
&& git clone https://github.com/spesmilo/python-for-android \

contrib/android/p4a_recipes/packaging/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from pythonforandroid.recipes.packaging import PackagingRecipe
2+
from pythonforandroid.util import HashPinnedDependency
23

34

45
assert PackagingRecipe._version == "26.0"
@@ -8,6 +9,10 @@
89

910
class PackagingRecipePinned(PackagingRecipe):
1011
sha512sum = "27a066a7d65ba76189212973b6a0d162f3d361848b1b0c34a82865cf180b3284a837cc34206c297f002a73feae414e25a26c5960bb884a74ea337f582585f1d2"
12+
hostpython_prerequisites = [
13+
HashPinnedDependency(package="flit-core==3.12.0",
14+
hashes=['sha256:e7a0304069ea895172e3c7bb703292e992c5d1555dd1233ab7b5621b5b69e62c']),
15+
]
1116

1217

1318
recipe = PackagingRecipePinned()

contrib/android/p4a_recipes/pyjnius/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313

1414
class PyjniusRecipePinned(util.InheritedRecipeMixin, PyjniusRecipe):
1515
hostpython_prerequisites = [
16+
HashPinnedDependency(package="setuptools==80.9.0",
17+
hashes=['sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922']),
18+
HashPinnedDependency(package="wheel==0.45.1",
19+
hashes=['sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248']),
1620
HashPinnedDependency(package="Cython==3.1.8",
1721
hashes=['sha256:282b3c8e6abc3fea421919e862e898ffdd86fc0796009bdb5ffdf8211413219f'])
1822
]

contrib/android/p4a_recipes/pyqt6sip/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ class PyQt6SipRecipePinned(util.InheritedRecipeMixin, PyQt6SipRecipe):
1717
hostpython_prerequisites = [
1818
HashPinnedDependency(package="setuptools==80.9.0",
1919
hashes=['sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922']),
20-
HashPinnedDependency(package="packaging==26.0",
21-
hashes=['sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529']),
2220
]
2321

2422

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from pythonforandroid.recipes.setuptools import SetuptoolsRecipe
2+
from pythonforandroid.util import HashPinnedDependency
3+
4+
5+
assert SetuptoolsRecipe._version == "80.9.0"
6+
assert SetuptoolsRecipe.depends == ['python3']
7+
assert SetuptoolsRecipe.python_depends == []
8+
9+
10+
class SetuptoolsRecipePinned(SetuptoolsRecipe):
11+
sha512sum = "36eb1f219d29c6b9e135936bde2001ad70a971c8069cd0175d3a5325b450e6843a903d3f70043c9f534768ebeab8ab0c544b8f44456555d333f1ed72daa5c18b"
12+
hostpython_prerequisites = [
13+
HashPinnedDependency(package="setuptools==80.9.0",
14+
hashes=['sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922']),
15+
]
16+
17+
18+
recipe = SetuptoolsRecipePinned()

contrib/android/p4a_recipes/sip/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from pythonforandroid.util import HashPinnedDependency
33

44
assert SipRecipe._version == "6.15.1"
5-
assert SipRecipe.depends == ["python3"], SipRecipe.depends
5+
assert SipRecipe.depends == ["python3", "packaging"], SipRecipe.depends
66
assert SipRecipe.python_depends == []
77

88

@@ -12,6 +12,11 @@ class SipRecipePinned(SipRecipe):
1212
hostpython_prerequisites = [
1313
HashPinnedDependency(package="setuptools==80.9.0",
1414
hashes=['sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922']),
15+
HashPinnedDependency(package="setuptools-scm==8.3.1",
16+
hashes=['sha256:332ca0d43791b818b841213e76b1971b7711a960761c5bea5fc5cdb5196fbce3']),
17+
HashPinnedDependency(package="packaging==26.0", # pulled in by setuptools-scm
18+
hashes=['sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529']),
19+
1520
]
1621

1722

0 commit comments

Comments
 (0)