Merge branch master of https://github.com/kivy/python-for-android into fix-env-py2...after solved conflicts

Author: Pol Canelles

.travis.yml

@@ -0,0 +1,27 @@
+sudo: required
+
+language: generic
+
+services:
+  - docker
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq python-tox
+
+env:
+  - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/android-ndk'
+  # overrides requirements to skip `peewee` pure python module, see:
+  # https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
+  - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/android-ndk --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools'
+  - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/android-ndk --bootstrap sdl2 --requirements python2,numpy'
+  - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/crystax-ndk'
+  - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/crystax-ndk --requirements python3crystax,setuptools,android'
+
+before_script:
+  # we want to fail fast on tox errors without having to `docker build` first
+  - tox
+
+script:
+  - docker build --tag=p4a .
+  - docker run p4a /bin/sh -c "$COMMAND"

Dockerfile

@@ -0,0 +1,84 @@
+# Dockerfile with:
+# 	- Android build environment
+# 	- python-for-android dependencies
+# Build with:
+# docker build --tag=p4a .
+# Run with:
+# docker run p4a /bin/sh -c '. venv/bin/activate && p4a apk --help'
+# Or for interactive shell:
+# docker run -it --rm p4a
+#
+# TODO:
+#	- delete archives to keep small the container small
+#	- setup caching (for apt, pip, ndk, sdk and p4a recipes downloads)
+FROM ubuntu:16.04
+
+
+# get the latest version from https://developer.android.com/ndk/downloads/index.html
+ENV ANDROID_NDK_VERSION="16b"
+# get the latest version from https://www.crystax.net/en/download
+ENV CRYSTAX_NDK_VERSION="10.3.2"
+# get the latest version from https://developer.android.com/studio/index.html
+ENV ANDROID_SDK_TOOLS_VERSION="3859397"
+
+ENV ANDROID_HOME="/opt/android"
+ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" \
+	CRYSTAX_NDK_HOME="${ANDROID_HOME}/crystax-ndk" \
+	ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
+ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" \
+	CRYSTAX_NDK_HOME_V="${CRYSTAX_NDK_HOME}-${CRYSTAX_NDK_VERSION}"
+ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip" \
+	CRYSTAX_NDK_ARCHIVE="crystax-ndk-${CRYSTAX_NDK_VERSION}-linux-x86.tar.xz" \
+	ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
+ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}" \
+	CRYSTAX_NDK_DL_URL="https://eu.crystax.net/download/${CRYSTAX_NDK_ARCHIVE}" \
+	ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
+
+# install system dependencies
+RUN apt update -qq && apt install -qq --yes --no-install-recommends \
+	python virtualenv python-pip wget curl lbzip2 patch bsdtar
+
+# build dependencies
+# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
+RUN dpkg --add-architecture i386 &&  apt update -qq && apt install -qq --yes --no-install-recommends \
+	build-essential ccache git libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
+	libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
+	openjdk-8-jdk unzip zlib1g-dev zlib1g:i386
+RUN	pip install --quiet --upgrade cython==0.21
+
+# download and install Android NDK
+RUN curl --location --progress-bar "${ANDROID_NDK_DL_URL}" --output "${ANDROID_NDK_ARCHIVE}" && \
+    mkdir --parents "${ANDROID_NDK_HOME_V}" && \
+    unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" && \
+	ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}"
+
+# download and install CrystaX NDK
+# added `gnutls_handshake` flag to workaround random `gnutls_handshake()` issues
+RUN curl --location --progress-bar "${CRYSTAX_NDK_DL_URL}" --output "${CRYSTAX_NDK_ARCHIVE}" --insecure && \
+    bsdtar -xf "${CRYSTAX_NDK_ARCHIVE}" --directory "${ANDROID_HOME}" \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/docs \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/samples \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/tests \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/renderscript \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/x86_64-* \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/llvm-* \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/aarch64-* \
+    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/mips64el-* && \
+	ln -sfn "${CRYSTAX_NDK_HOME_V}" "${CRYSTAX_NDK_HOME}"
+
+# download and install Android SDK
+RUN curl --location --progress-bar "${ANDROID_SDK_TOOLS_DL_URL}" --output "${ANDROID_SDK_TOOLS_ARCHIVE}" && \
+    mkdir --parents "${ANDROID_SDK_HOME}" && \
+    unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}"
+
+# update Android SDK, install Android API, Build Tools...
+RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" && \
+	echo '### User Sources for Android SDK Manager' > "${ANDROID_SDK_HOME}/.android/repositories.cfg"
+RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" --licenses
+RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-19"
+RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;26.0.2"
+
+# install python-for-android from current branch
+WORKDIR /app
+COPY . /app
+RUN virtualenv --python=python venv && . venv/bin/activate && pip install --quiet -e .

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Kivy Team and other contributors
+Copyright (c) 2010-2017 Kivy Team and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -0,0 +1,107 @@
+python-for-android
+==================
+
+|Build Status|
+
+.. |Build Status| image:: https://secure.travis-ci.org/kivy/python-for-android.png?branch=master
+   :target: https://travis-ci.org/kivy/python-for-android
+
+python-for-android is a packager for Python apps on Android. You can
+create your own Python distribution including the modules and
+dependencies you want, and bundle it in an APK along with your own code.
+
+Features include:
+
+-  Support for building with both Python 2 and Python 3.
+-  Different app backends including Kivy, PySDL2, and a WebView with
+   Python webserver.
+-  Automatic support for most pure Python modules, and built in support
+   for many others, including popular dependencies such as numpy and
+   sqlalchemy.
+-  Multiple architecture targets, for APKs optimised on any given
+   device.
+
+For documentation and support, see:
+
+-  Website: http://python-for-android.readthedocs.io
+-  Mailing list: https://groups.google.com/forum/#!forum/kivy-users or
+   https://groups.google.com/forum/#!forum/python-android.
+
+In 2015 these tools were rewritten to provide a new, easier to use and
+extend interface. If you are looking for the old toolchain with
+distribute.sh and build.py, it is still available at
+https://github.com/kivy/python-for-android/tree/old\_toolchain, and
+issues and PRs relating to this branch are still accepted. However, the
+new toolchain contains all the same functionality via the built in
+pygame bootstrap.
+
+Documentation
+=============
+
+Follow the `quickstart
+instructions <https://python-for-android.readthedocs.org/en/latest/quickstart/>`__
+to install and begin creating APKs.
+
+Quick instructions to start would be::
+
+    pip install python-for-android
+
+or to test the master branch::
+
+    pip install git+https://github.com/kivy/python-for-android.git
+
+The executable is called ``python-for-android`` or ``p4a`` (both are
+equivalent). To test that the installation worked, try::
+
+    python-for-android recipes
+
+This should return a list of recipes available to be built.
+
+To build any distributions, you need to set up the Android SDK and NDK
+as described in the documentation linked above.
+
+If you did this, to build an APK with SDL2 you can try e.g.::
+
+    p4a apk --requirements=kivy --private /home/asandy/devel/planewave_frozen/ --package=net.inclem.planewavessdl2 --name="planewavessdl2" --version=0.5 --bootstrap=sdl2
+
+For full instructions and parameter options, see `the
+documentation <https://python-for-android.readthedocs.io/en/latest/quickstart/#usage>`__.
+
+Support
+=======
+
+If you need assistance, you can ask for help on our mailing list:
+
+-  User Group: https://groups.google.com/group/kivy-users
+-  Email: [email protected]
+
+We also have an IRC channel:
+
+-  Server: irc.freenode.net
+-  Port: 6667, 6697 (SSL only)
+-  Channel: #kivy
+
+Contributing
+============
+
+We love pull requests and discussing novel ideas. Check out our
+`contribution guide <http://kivy.org/docs/contribute.html>`__ and feel
+free to improve python-for-android.
+
+The following mailing list and IRC channel are used exclusively for
+discussions about developing the Kivy framework and its sister projects:
+
+-  Dev Group: https://groups.google.com/group/kivy-dev
+-  Email: [email protected]
+
+IRC channel:
+
+-  Server: irc.freenode.net
+-  Port: 6667, 6697 (SSL only)
+-  Channel: #kivy or #kivy-dev
+
+License
+=======
+
+python-for-android is released under the terms of the MIT License.
+Please refer to the LICENSE file.