Updated numpy version targeted by matplotlib recipe

kivy · Jun 28, 2019 · 00a59e7 · 00a59e7
1 parent 5683040
commit 00a59e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pythonforandroid/recipes/matplotlib/mpl_android_fixes.patch b/pythonforandroid/recipes/matplotlib/mpl_android_fixes.patch
@@ -4,26 +4,26 @@ index fc82d5d..2067db0 100644
 +++ b/setupext.py
 @@ -1004,10 +1004,10 @@ class Numpy(SetupPackage):
          ext.define_macros.append(('__STDC_FORMAT_MACROS', 1))
- 
+
      def get_setup_requires(self):
 -        return ['numpy>=1.10.0']
-+        return ['numpy==1.15.1']  # to match p4a's target version
- 
++        return ['numpy==1.16.4']  # to match p4a's target version
+
      def get_install_requires(self):
 -        return ['numpy>=1.10.0']
-+        return ['numpy==1.15.1']  # to match p4a's target version
- 
- 
++        return ['numpy==1.16.4']  # to match p4a's target version
+
+
  class LibAgg(SetupPackage):
 @@ -1443,9 +1443,10 @@ class BackendAgg(OptionalBackendPackage):
- 
+
  class BackendTkAgg(OptionalBackendPackage):
      name = "tkagg"
 -    force = True
 +    force = False
- 
+
      def check(self):
 +        raise CheckFailed("Disabled by patching during Android build")  # tk doesn't work on Android but causes build problems
          return "installing; run-time loading from Python Tcl / Tk"
- 
+
      def get_extension(self):
diff --git a/testapps/setup_testapp_python3_matplotlib.py b/testapps/setup_testapp_python3_matplotlib.py
@@ -19,7 +19,7 @@
 print('packages are', packages)
 
 setup(
-    name='testapp_matplotlib',
+    name='matplotlib_testapp',
     version='0.1',
     description='p4a setup.py test',
     author='Alexander Taylor',