Skip to content

Commit b47e220

Browse files
committed
Updated numpy version targeted by matplotlib recipe
1 parent d5120a8 commit b47e220

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

pythonforandroid/recipes/matplotlib/mpl_android_fixes.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ index fc82d5d..2067db0 100644
44
+++ b/setupext.py
55
@@ -1004,10 +1004,10 @@ class Numpy(SetupPackage):
66
ext.define_macros.append(('__STDC_FORMAT_MACROS', 1))
7-
7+
88
def get_setup_requires(self):
99
- return ['numpy>=1.10.0']
10-
+ return ['numpy==1.15.1'] # to match p4a's target version
11-
10+
+ return ['numpy==1.16.4'] # to match p4a's target version
11+
1212
def get_install_requires(self):
1313
- return ['numpy>=1.10.0']
14-
+ return ['numpy==1.15.1'] # to match p4a's target version
15-
16-
14+
+ return ['numpy==1.16.4'] # to match p4a's target version
15+
16+
1717
class LibAgg(SetupPackage):
1818
@@ -1443,9 +1443,10 @@ class BackendAgg(OptionalBackendPackage):
19-
19+
2020
class BackendTkAgg(OptionalBackendPackage):
2121
name = "tkagg"
2222
- force = True
2323
+ force = False
24-
24+
2525
def check(self):
2626
+ raise CheckFailed("Disabled by patching during Android build") # tk doesn't work on Android but causes build problems
2727
return "installing; run-time loading from Python Tcl / Tk"
28-
28+
2929
def get_extension(self):

testapps/setup_testapp_python3_matplotlib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
print('packages are', packages)
2020

2121
setup(
22-
name='testapp_matplotlib',
22+
name='matplotlib_testapp',
2323
version='0.1',
2424
description='p4a setup.py test',
2525
author='Alexander Taylor',

0 commit comments

Comments
 (0)