Skip to content

Commit a381a1c

Browse files
T-Dynamosclayote
authored andcommitted
python: update to 3.14.0
1 parent 04a95db commit a381a1c

File tree

4 files changed

+6
-21
lines changed

4 files changed

+6
-21
lines changed

pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected static ArrayList<String> getLibraries(File libsDir) {
5151
addLibraryIfExists(libsList, name, libsDir);
5252
}
5353

54-
for (int v = 5; v <= 14; v++) {
54+
for (int v = 14; v >= 5; v--) {
5555
libsList.add("python3." + v + (v <= 7 ? "m" : ""));
5656
}
5757

pythonforandroid/recipes/hostpython3/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class HostPython3Recipe(Recipe):
3636
:class:`~pythonforandroid.python.HostPythonRecipe`
3737
'''
3838

39-
version = '3.11.13'
39+
version = '3.14.0'
4040

4141
url = 'https://github.com/python/cpython/archive/refs/tags/v{version}.tar.gz'
4242
'''The default url to download our host python recipe. This url will

pythonforandroid/recipes/python3/__init__.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Python3Recipe(TargetPythonRecipe):
5454
:class:`~pythonforandroid.python.GuestPythonRecipe`
5555
'''
5656

57-
version = '3.11.13'
57+
version = '3.14.0'
5858
_p_version = Version(version)
5959
url = 'https://github.com/python/cpython/archive/refs/tags/v{version}.tar.gz'
6060
name = 'python3'
@@ -389,17 +389,12 @@ def create_python_bundle(self, dirn, arch):
389389
place.
390390
"""
391391
# Todo: find a better way to find the build libs folder
392-
modules_build_dir = join(
392+
modules_build_dir = glob.glob(join(
393393
self.get_build_dir(arch.arch),
394394
'android-build',
395395
'build',
396-
'lib.{}{}-{}-{}'.format(
397-
# android is now supported platform
398-
"android" if self._p_version.minor >= 13 else "linux",
399-
'2' if self.version[0] == '2' else '',
400-
arch.command_prefix.split('-')[0],
401-
self.major_minor_version_string
402-
))
396+
'lib.*'
397+
))[0]
403398

404399
# Compile to *.pyc the python modules
405400
self.compile_python_files(modules_build_dir)

pythonforandroid/recipes/six/__init__.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)