Browse Source

android build: bump python version (3.8.18->3.10.14)

cffi also had to be updated for this, and corresponding commit backported from upstream p4a
master
SomberNight 2 years ago
parent
commit
cfb53e4880
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 2
      contrib/android/Dockerfile
  2. 4
      contrib/android/p4a_recipes/cffi/__init__.py
  3. 4
      contrib/android/p4a_recipes/hostpython3/__init__.py
  4. 4
      contrib/android/p4a_recipes/python3/__init__.py

2
contrib/android/Dockerfile

@ -198,7 +198,7 @@ RUN cd /opt \
&& git remote add accumulator https://github.com/accumulator/python-for-android \
&& git fetch --all \
# commit: from branch sombernight/qt6-wip (note: careful with force-pushing! see #8162) \
&& git checkout "04e80084ebbb9bcfdbb32e814d4a1f5826ffe4eb^{commit}" \
&& git checkout "5df11be775eadcc19774e5bb118ee407330b8d83^{commit}" \
&& /opt/venv/bin/python3 -m pip install --no-build-isolation --no-dependencies -e .
# build env vars

4
contrib/android/p4a_recipes/cffi/__init__.py

@ -6,13 +6,13 @@ from pythonforandroid.util import load_source
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py'))
assert CffiRecipe._version == "1.13.2"
assert CffiRecipe._version == "1.15.1"
assert CffiRecipe.depends == ['setuptools', 'pycparser', 'libffi', 'python3']
assert CffiRecipe.python_depends == []
class CffiRecipePinned(util.InheritedRecipeMixin, CffiRecipe):
sha512sum = "2c57d9c06c39e95498a54408dc39940427190f3c03e1b8f1a3584140db08a5775dd12e6e67b03093429c130af579d01519b0fc868b99ba7a530068ed22d38522"
sha512sum = "e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5"
recipe = CffiRecipePinned()

4
contrib/android/p4a_recipes/hostpython3/__init__.py

@ -11,8 +11,8 @@ assert HostPython3Recipe.python_depends == []
class HostPython3RecipePinned(util.InheritedRecipeMixin, HostPython3Recipe):
version = "3.8.18"
sha512sum = "2b98575763e21ba54428eb3e93418a3ea244f1dcdb4729ff0d17ac2d76cb45d228f0f97a2a24e59a7f0428234415e8bd129bbc0e8f2067bfd054d03df1641cf0"
version = "3.10.14"
sha512sum = "113d8faf2685a7a9e868e4c0ecb2767aae3e54a8d3722a2de5ca00049b336c8728a6a6506b282326d94acc71a5c534ea706ad7b886a6ec7d15eaf46505ef233b"
recipe = HostPython3RecipePinned()

4
contrib/android/p4a_recipes/python3/__init__.py

@ -11,8 +11,8 @@ assert Python3Recipe.python_depends == []
class Python3RecipePinned(util.InheritedRecipeMixin, Python3Recipe):
version = "3.8.18"
sha512sum = "2b98575763e21ba54428eb3e93418a3ea244f1dcdb4729ff0d17ac2d76cb45d228f0f97a2a24e59a7f0428234415e8bd129bbc0e8f2067bfd054d03df1641cf0"
version = "3.10.14"
sha512sum = "113d8faf2685a7a9e868e4c0ecb2767aae3e54a8d3722a2de5ca00049b336c8728a6a6506b282326d94acc71a5c534ea706ad7b886a6ec7d15eaf46505ef233b"
recipe = Python3RecipePinned()

Loading…
Cancel
Save