Merge pull request #1 from adin234/scipy

adin234 · web-flow · commit be10c0216cee · 2021-01-06T00:47:01.000+08:00
better recipe names, imports
diff --git a/pythonforandroid/recipes/lapack/__init__.py b/pythonforandroid/recipes/lapack/__init__.py
@@ -1,12 +1,12 @@
 from pythonforandroid.recipe import Recipe
 from pythonforandroid.logger import shprint
-from pythonforandroid.util import current_directory, ensure_dir
+from pythonforandroid.util import current_directory, ensure_dir, BuildInterruptingException
 from multiprocessing import cpu_count
 from os.path import join
 import sh
 
 
-class This(Recipe):
+class LapackRecipe(Recipe):
 
     name = 'lapack'
     version = 'v3.9.0'
@@ -21,7 +21,7 @@ def get_recipe_env(self, arch):
         FC = f"{env['TOOLCHAIN_PREFIX']}-gfortran"
         env['FC'] = f'{FC} --sysroot={sysroot}'
         if sh.which(FC) is None:
-            raise Exception(f"{FC} not found. See https://github.com/mzakharo/android-gfortran")
+            raise BuildInterruptingException(f"{FC} not found. See https://github.com/mzakharo/android-gfortran")
         return env
 
     def build_arch(self, arch):
@@ -50,4 +50,4 @@ def build_arch(self, arch):
             shprint(sh.make, 'install', _env=env)
 
 
-recipe = This()
+recipe = LapackRecipe()
diff --git a/pythonforandroid/recipes/numpy/__init__.py b/pythonforandroid/recipes/numpy/__init__.py
@@ -1,7 +1,10 @@
-from pythonforandroid.recipe import CompiledComponentsPythonRecipe, sh, info, current_directory, shprint
+from pythonforandroid.recipe import CompiledComponentsPythonRecipe
+from pythonforandroid.logger import shprint, info
+from pythonforandroid.util import current_directory
 from multiprocessing import cpu_count
 from os.path import join
 import glob
+import sh
 
 
 class NumpyRecipe(CompiledComponentsPythonRecipe):
diff --git a/pythonforandroid/recipes/scipy/__init__.py b/pythonforandroid/recipes/scipy/__init__.py
@@ -3,7 +3,7 @@
 from os.path import join
 
 
-class ThisRecipe(CompiledComponentsPythonRecipe):
+class ScipyRecipe(CompiledComponentsPythonRecipe):
 
     version = '1.5.4'
     url = f'https://github.com/scipy/scipy/releases/download/v{version}/scipy-{version}.zip'
@@ -46,4 +46,4 @@ def get_recipe_env(self, arch):
         return env
 
 
-recipe = ThisRecipe()
+recipe = ScipyRecipe()
