Skip to content

Commit 4288ff9

Browse files
committed
scipy: update to 1.11.3
1 parent cff978d commit 4288ff9

File tree

3 files changed

+1113
-5
lines changed

3 files changed

+1113
-5
lines changed

pythonforandroid/recipes/pybind11/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class Pybind11Recipe(PythonRecipe):
66

7-
version = '2.9.0'
7+
version = '2.11.1'
88
url = 'https://github.com/pybind/pybind11/archive/refs/tags/v{version}.zip'
99
depends = ['setuptools']
1010
call_hostpython_via_targetpython = False

pythonforandroid/recipes/scipy/__init__.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
from pythonforandroid.recipe import CompiledComponentsPythonRecipe, Recipe
21
from multiprocessing import cpu_count
32
from os.path import join
43
from os import environ
5-
from pythonforandroid.util import build_platform
4+
import sh
5+
from pythonforandroid.logger import shprint
6+
from pythonforandroid.recipe import CompiledComponentsPythonRecipe, Recipe
7+
from pythonforandroid.util import build_platform, current_directory
68

79

810
def arch_to_toolchain(arch):
@@ -13,12 +15,14 @@ def arch_to_toolchain(arch):
1315

1416
class ScipyRecipe(CompiledComponentsPythonRecipe):
1517

16-
version = '1.8.1'
17-
url = f'https://github.com/scipy/scipy/releases/download/v{version}/scipy-{version}.zip'
18+
version = 'maintenance/1.11.x'
19+
url = 'git+https://github.com/scipy/scipy.git'
20+
git_commit = 'b430bf54b5064465983813e2cfef3fcb86c3df07' # version 1.11.3
1821
site_packages_name = 'scipy'
1922
depends = ['setuptools', 'cython', 'numpy', 'lapack', 'pybind11']
2023
call_hostpython_via_targetpython = False
2124
need_stl_shared = True
25+
patches = ["setup.py.patch"]
2226

2327
def build_compiled_components(self, arch):
2428
self.setup_extra_args = ['-j', str(cpu_count())]
@@ -30,6 +34,12 @@ def rebuild_compiled_components(self, arch, env):
3034
super().rebuild_compiled_components(arch, env)
3135
self.setup_extra_args = []
3236

37+
def download_file(self, url, target, cwd=None):
38+
super().download_file(url, target, cwd=cwd)
39+
with current_directory(target):
40+
shprint(sh.git, 'fetch', '--unshallow')
41+
shprint(sh.git, 'checkout', self.git_commit)
42+
3343
def get_recipe_env(self, arch):
3444
env = super().get_recipe_env(arch)
3545
arch_env = arch.get_env()

0 commit comments

Comments
 (0)