Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant class variable definition from recipes #2938

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class TargetPython(Enum):
'libtorrent',
# pybind11 build fails on macos
'pybind11',
'pygame',
])

BROKEN_RECIPES = {
Expand Down
1 change: 0 additions & 1 deletion pythonforandroid/recipes/aiohttp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class AIOHTTPRecipe(CppCompiledComponentsPythonRecipe): # type: ignore # pylint
url = "https://pypi.python.org/packages/source/a/aiohttp/aiohttp-{version}.tar.gz"
name = "aiohttp"
depends: List[str] = ["setuptools"]
call_hostpython_via_targetpython = False
install_in_hostpython = True

def get_recipe_env(self, arch):
Expand Down
1 change: 0 additions & 1 deletion pythonforandroid/recipes/flask/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class FlaskRecipe(PythonRecipe):
python_depends = ['jinja2', 'werkzeug', 'markupsafe', 'itsdangerous', 'click']

call_hostpython_via_targetpython = False
install_in_hostpython = False


recipe = FlaskRecipe()
3 changes: 0 additions & 3 deletions pythonforandroid/recipes/pandas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ class PandasRecipe(CppCompiledComponentsPythonRecipe):
python_depends = ['python-dateutil', 'pytz']
patches = ['fix_numpy_includes.patch']

call_hostpython_via_targetpython = False
need_stl_shared = True

def get_recipe_env(self, arch):
env = super().get_recipe_env(arch)
# we need the includes from our installed numpy at site packages
Expand Down
1 change: 0 additions & 1 deletion pythonforandroid/recipes/protobuf_cpp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class ProtobufCppRecipe(CppCompiledComponentsPythonRecipe):
name = 'protobuf_cpp'
version = '3.6.1'
url = 'https://github.com/google/protobuf/releases/download/v{version}/protobuf-python-{version}.tar.gz'
call_hostpython_via_targetpython = False
depends = ['cffi', 'setuptools']
site_packages_name = 'google/protobuf/pyext'
setup_extra_args = ['--cpp_implementation']
Expand Down
1 change: 0 additions & 1 deletion pythonforandroid/recipes/pygame/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class Pygame2Recipe(CompiledComponentsPythonRecipe):

depends = ['sdl2', 'sdl2_image', 'sdl2_mixer', 'sdl2_ttf', 'setuptools', 'jpeg', 'png']
call_hostpython_via_targetpython = False # Due to setuptools
install_in_hostpython = False

def prebuild_arch(self, arch):
super().prebuild_arch(arch)
Expand Down
2 changes: 0 additions & 2 deletions pythonforandroid/recipes/secp256k1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ class Secp256k1Recipe(CppCompiledComponentsPythonRecipe):
version = '0.13.2.4'
url = 'https://github.com/ludbb/secp256k1-py/archive/{version}.tar.gz'

call_hostpython_via_targetpython = False

depends = [
'openssl',
'hostpython3',
Expand Down
2 changes: 0 additions & 2 deletions pythonforandroid/recipes/sympy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ class SympyRecipe(PythonRecipe):

depends = ['mpmath']

call_hostpython_via_targetpython = True

patches = ['fix_timeutils.patch', 'fix_pretty_print.patch']


Expand Down
3 changes: 0 additions & 3 deletions pythonforandroid/recipes/twisted/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ class TwistedRecipe(CythonRecipe):
depends = ['setuptools', 'zope_interface', 'incremental', 'constantly']
patches = ['incremental.patch', 'remove_tests.patch']

call_hostpython_via_targetpython = False
install_in_hostpython = False

def prebuild_arch(self, arch):
super().prebuild_arch(arch)
# TODO Need to whitelist tty.pyo and termios.so here
Expand Down