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.

Sign up for GitHub

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

Jump to bottom

Call Cython via python -m Cython rather than system-wide binary #1937

Merged
1 commit merged into from Aug 4, 2019
Merged

Call Cython via python -m Cython rather than system-wide binary #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions Dockerfile.py2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ RUN usermod -append --groups sudo ${USER}
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers


RUN pip install --upgrade cython==0.28.6

WORKDIR ${WORK_DIR}
COPY --chown=user:user . ${WORK_DIR}
RUN chown --recursive ${USER} ${ANDROID_SDK_HOME}
Expand All @@ -132,4 +130,5 @@ USER ${USER}
# install python-for-android from current branch
RUN virtualenv --python=python venv \
&& . venv/bin/activate \
&& pip install --upgrade cython==0.28.6 \
&& pip install -e .
7 changes: 4 additions & 3 deletions Dockerfile.py3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ENV WORK_DIR="${HOME_DIR}" \
# install system dependencies
RUN ${RETRY} apt -y install -qq --no-install-recommends \
python3 virtualenv python3-pip python3-venv \
wget lbzip2 patch sudo \
wget lbzip2 patch sudo python python-pip \
&& apt -y autoremove

# build dependencies
Expand Down Expand Up @@ -122,8 +122,8 @@ RUN useradd --create-home --shell /bin/bash ${USER}
RUN usermod -append --groups sudo ${USER}
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers


RUN pip3 install --upgrade cython==0.28.6
# install cython for python 2 (for python 3 it's inside the venv)
RUN pip2 install --upgrade Cython==0.28.6

WORKDIR ${WORK_DIR}
COPY --chown=user:user . ${WORK_DIR}
Expand All @@ -133,4 +133,5 @@ USER ${USER}
# install python-for-android from current branch
RUN virtualenv --python=python3 venv \
&& . venv/bin/activate \
&& pip3 install --upgrade Cython==0.28.6 \
&& pip3 install -e .
18 changes: 8 additions & 10 deletions pythonforandroid/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@
RECOMMENDED_NDK_API, RECOMMENDED_TARGET_API)


def get_cython_path():
for cython_fn in ("cython", "cython3", "cython2", "cython-2.7"):
cython = sh.which(cython_fn)
if cython:
return cython
raise BuildInterruptingException('No cython binary found.')


def get_ndk_platform_dir(ndk_dir, ndk_api, arch):
ndk_platform_dir_exists = True
platform_dir = arch.platform_dir
Expand Down Expand Up @@ -111,7 +103,6 @@ class Context(object):
use_setup_py = False

ccache = None # whether to use ccache
cython = None # the cython interpreter name

ndk_platform = None # the ndk platform directory

Expand Down Expand Up @@ -374,7 +365,14 @@ def prepare_build_environment(self,
if not self.ccache:
info('ccache is missing, the build will not be optimized in the '
'future.')
self.cython = get_cython_path()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we still add a check here for Cython being available, or a BuildInterruptingException if not?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, good point! Sure, that would be possible, let me have a look at it

try:
subprocess.check_output([
"python3", "-m", "cython", "--help",
])
except subprocess.CalledProcessError:
warning('Cython for python3 missing. If you are building for '
' a python 3 target (which is the default)'
' then THINGS WILL BREAK.')
AndreMiras marked this conversation as resolved.
Show resolved Hide resolved

# This would need to be changed if supporting multiarch APKs
arch = self.archs[0]
Expand Down
7 changes: 5 additions & 2 deletions pythonforandroid/recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,8 +1024,11 @@ def cythonize_file(self, env, build_dir, filename):
del cyenv['PYTHONPATH']
if 'PYTHONNOUSERSITE' in cyenv:
cyenv.pop('PYTHONNOUSERSITE')
cython_command = sh.Command(self.ctx.cython)
shprint(cython_command, filename, *self.cython_args, _env=cyenv)
python_command = sh.Command("python{}".format(
self.ctx.python_recipe.major_minor_version_string.split(".")[0]
AndreMiras marked this conversation as resolved.
Show resolved Hide resolved
))
shprint(python_command, "-m", "Cython.Build.Cythonize",
filename, *self.cython_args, _env=cyenv)

def cythonize_build(self, env, build_dir="."):
if not self.cythonize:
Expand Down
3 changes: 0 additions & 3 deletions tests/test_toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ def test_create(self):
) as m_get_toolchain_versions, mock.patch(
'pythonforandroid.build.get_ndk_platform_dir'
) as m_get_ndk_platform_dir, mock.patch(
'pythonforandroid.build.get_cython_path'
) as m_get_cython_path, mock.patch(
'pythonforandroid.toolchain.build_recipes'
) as m_build_recipes, mock.patch(
'pythonforandroid.bootstraps.service_only.'
Expand All @@ -84,7 +82,6 @@ def test_create(self):
mock.call('/tmp/android-sdk')]
assert m_get_toolchain_versions.call_args_list == [
mock.call('/tmp/android-ndk', mock.ANY)]
assert m_get_cython_path.call_args_list == [mock.call()]
build_order = [
'hostpython3', 'libffi', 'openssl', 'sqlite3', 'python3',
'genericndkbuild', 'setuptools', 'six', 'pyjnius', 'android',
Expand Down