kivy · AndreMiras · Jun 2, 2020 · Apr 28, 2020 · Apr 29, 2020 · Apr 29, 2020
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,23 +1,24 @@
 <!--
-The issue tracker is a tool to address bugs.
-Please use the Disord community or Stack Overflow for support questions,
+The issue tracker is a tool to address bugs NOT a support platform.
+Please use the Discord community or Stack Overflow for support questions,
 more information at https://github.com/kivy/python-for-android#support
-
-Before opening a new issue, make sure you do the following:
-    * check that your issue isn't already filed: https://github.com/kivy/python-for-android/issues
-    * prepare a short, runnable example that reproduces the issue
-    * make sure to have `log_level = 2` in your `buildozer.spec`
-    * reproduce the problem with the latest development version (`p4a.branch = master`)
-    * double-check that the issue is indeed a bug and not a support request
-    * please use backticks to format code or logs
 -->
 
+### Checklist
+
+- [ ] the issue is indeed a bug and not a support request
+- [ ] issue doesn't already exist: https://github.com/kivy/python-for-android/issues
+- [ ] I have a short, runnable example that reproduces the issue
+- [ ] I reproduced the problem with the latest development version (`p4a.branch = develop`)
+- [ ] I used the grave accent (aka backticks) to format code or logs when appropriated
+
 ### Versions
 
-* Python:
-* OS:
-* Kivy:
-* Cython:
+- Python:
+- OS:
+- Kivy:
+- Cython:
+- OpenJDK:
 
 ### Description
 
@@ -28,6 +29,7 @@ Before opening a new issue, make sure you do the following:
 Command:
 ```sh
 // REPLACE ME: buildozer command ran? e.g. buildozer android debug
+// Keep the triple grave accent (aka backquote/backtick) to have the code formatted
 ```
 
 Spec file:
@@ -38,5 +40,6 @@ Spec file:
 ### Logs
 
 ```
-// REPLACE ME: Paste the build ouput containing the error
+// REPLACE ME: Paste the build output containing the error
+// Keep the triple grave accent (a.k.a. backquote/backtick) to have the code formatted
 ```
diff --git a/.travis.yml b/.travis.yml
@@ -52,7 +52,7 @@ jobs:
         # installs java 1.8, android's SDK/NDK and p4a
         - make -f ci/makefiles/osx.mk
         - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
-      script: make testapps-no-venv/armeabi-v7a
+      script: make testapps/armeabi-v7a
     - <<: *testapps
       name: Rebuild updated recipes
       script: travis_wait 30 make docker/run/make/rebuild_updated_recipes

diff --git a/Dockerfile b/Dockerfile
@@ -15,17 +15,19 @@
 #     Use 'docker run' without '--rm' flag for keeping the container and use
 #     'docker commit <container hash> <new image>' to extend the original image
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 # configure locale
-RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
+RUN apt -y update -qq > /dev/null \
+    && DEBIAN_FRONTEND=noninteractive apt install -qq --yes --no-install-recommends \
     locales && \
     locale-gen en_US.UTF-8
 ENV LANG="en_US.UTF-8" \
     LANGUAGE="en_US.UTF-8" \
     LC_ALL="en_US.UTF-8"
 
-RUN apt -y update -qq > /dev/null && apt -y install -qq --no-install-recommends \
+RUN apt -y update -qq > /dev/null \
+    && DEBIAN_FRONTEND=noninteractive apt install -qq --yes --no-install-recommends \
 	ca-certificates \
     curl \
     && apt -y autoremove \
@@ -49,7 +51,7 @@ ENV WORK_DIR="${HOME_DIR}/app" \
 # install system dependencies
 RUN dpkg --add-architecture i386 \
     && ${RETRY} apt -y update -qq > /dev/null \
-    && ${RETRY} apt -y install -qq --no-install-recommends \
+    && ${RETRY} DEBIAN_FRONTEND=noninteractive apt install -qq --yes --no-install-recommends \
     autoconf \
     automake \
     autopoint \
@@ -64,8 +66,6 @@ RUN dpkg --add-architecture i386 \
     libidn11:i386 \
     libltdl-dev \
     libncurses5:i386 \
-    libpangox-1.0-0:i386 \
-    libpangoxft-1.0-0:i386 \
     libssl-dev \
     libstdc++6:i386 \
     libtool \

diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ all: virtualenv
 
 $(VIRTUAL_ENV):
 	python3 -m venv $(VIRTUAL_ENV)
-	$(PIP) install Cython==0.28.6
+	$(PIP) install Cython==0.29.19
 	$(PIP) install -e .
 
 virtualenv: $(VIRTUAL_ENV)
@@ -38,7 +38,7 @@ testapps-with-numpy/%: virtualenv
 	$(eval $@_APP_ARCH := $(shell basename $*))
 	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
     python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
-    --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools,numpy \
+    --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,urllib3,chardet,idna,sqlite3,setuptools,numpy \
     --arch=$($@_APP_ARCH)
 
 testapps/%: virtualenv
@@ -47,14 +47,6 @@ testapps/%: virtualenv
     python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --arch=$($@_APP_ARCH)
 
-testapps-no-venv/%:
-	pip3 install Cython==0.28.6
-	pip3 install -e .
-	$(eval $@_APP_ARCH := $(shell basename $*))
-	cd testapps/on_device_unit_tests/ && \
-    python3 setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
-    --arch=$($@_APP_ARCH)
-
 clean:
 	find . -type d -name "__pycache__" -exec rm -r {} +
 	find . -type d -name "*.egg-info" -exec rm -r {} +

diff --git a/README.md b/README.md
@@ -13,7 +13,6 @@ 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

diff --git a/ci/makefiles/osx.mk b/ci/makefiles/osx.mk
@@ -11,7 +11,7 @@ install_java:
 	/usr/libexec/java_home -V
 
 upgrade_cython:
-	pip3 install --upgrade Cython==0.28.6
+	pip3 install --upgrade Cython==0.29.19
 
 install_android_ndk_sdk:
 	mkdir -p $(ANDROID_HOME)

diff --git a/doc/source/contribute.rst b/doc/source/contribute.rst
@@ -55,8 +55,8 @@ At this point, wait for reviewer approval and conclude any discussion that arise
 - Merge the release branch to the ``master`` branch.
 - Also merge the release branch to the ``develop`` branch.
 - Tag the release commit in ``master``, with tag ``vYYYY.MM.DD``. Include a short summary of the changes.
-- Create the release distributions: ``python3 setup.py sdist bdist_wheel``
-- Upload the release to pypi: ``python3 -m twine upload``.
+- Release distributions and PyPI upload should be `handled by the CI
+  <https://github.com/kivy/python-for-android/blob/v2020.04.29/.travis.yml#L60-L70>`_.
 - Add to the Github release page (see e.g. `this example <https://github.com/kivy/python-for-android/releases/tag/v2019.06.06>`__):
   - The python-for-android README summary
   - A short list of major changes in this release, if any
@@ -67,15 +67,18 @@ At this point, wait for reviewer approval and conclude any discussion that arise
 
 Release checklist
 ~~~~~~~~~~~~~~~~~
-
-- [ ] Check that the [build is passing](https://travis-ci.org/kivy/python-for-android)
-- [ ] Run the tests locally via `tox`: this performs some long-running tests that are skipped on Travis.
-- [ ] Build and run the [on_device_unit_tests](https://github.com/kivy/python-for-android/tree/master/testapps/on_device_unit_tests) app using buildozer. Check that they all pass.
-- [ ] Build and run the following [testapps](https://github.com/kivy/python-for-android/tree/master/testapps) for arch `armeabi-v7a` and `arm64-v8a`:
-  - `python3 setup_testapp_python3_sqlite_openssl.py apk`
-    - [ ] `armeabi-v7a`
-    - [ ] `arm64-v8a`
-- [ ] Check that the version number is correct
+::
+
+    - [ ] Check that the builds are passing
+      - [ ] [Travis build](https://travis-ci.org/kivy/python-for-android)
+      - [ ] [GitHub Action](https://github.com/kivy/python-for-android/actions)
+    - [ ] Run the tests locally via `tox`: this performs some long-running tests that are skipped on Travis.
+    - [ ] Build and run the [on_device_unit_tests](https://github.com/kivy/python-for-android/tree/master/testapps/on_device_unit_tests) app using buildozer. Check that they all pass.
+    - [ ] Build (or download from github actions) and run the following [testapps](https://github.com/kivy/python-for-android/tree/master/testapps/on_device_unit_tests) for arch `armeabi-v7a` and `arm64-v8a`:
+      - [ ] on_device_unit_tests
+        - [ ] `armeabi-v7a` (`cd testapps/on_device_unit_tests && PYTHONPATH=.:../../ python3 setup.py apk  --ndk-dir=<your-ndk-dir> --sdk-dir=<your-sdk-dir> --arch=armeabi-v7a --debug`)
+        - [ ] `arm64-v8a` (`cd testapps/on_device_unit_tests && PYTHONPATH=.:../../ python3 setup.py apk  --ndk-dir=<your-ndk-dir> --sdk-dir=<your-sdk-dir> --arch=arm64-v8a --debug`)
+    - [ ] Check that the version number is correct
 
 
 

diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
@@ -62,14 +62,16 @@ Installing Dependencies
 p4a has several dependencies that must be installed:
 
 - ant
-- autoconf (for ffpyplayer_codecs recipe)
+- autoconf (for libffi and other recipes)
+- automake
 - ccache (optional)
 - cmake (required for some native code recipes like jpeg's recipe)
 - cython (can be installed via pip)
 - gcc
 - git
 - libncurses (including 32 bit)
-- libtool (for ffpyplayer_codecs recipe)
+- libtool (for libffi and recipes)
+- libssl-dev (for TLS/SSL support on hostpython3 and recipe)
 - openjdk-8
 - patch
 - python3
@@ -83,14 +85,20 @@ install most of these with::
 
     sudo dpkg --add-architecture i386
     sudo apt-get update
-    sudo apt-get install -y build-essential ccache git zlib1g-dev python3 python3-dev libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-8-jdk unzip ant ccache autoconf libtool
+    sudo apt-get install -y build-essential ccache git zlib1g-dev python3 python3-dev libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-8-jdk unzip ant ccache autoconf libtool libssl-dev
 
 On Arch Linux you should be able to run the following to
 install most of the dependencies (note: this list may not be
 complete)::
 
     sudo pacman -S core/autoconf core/automake core/gcc core/make core/patch core/pkgconf extra/cmake extra/jdk8-openjdk extra/python-pip extra/unzip extra/zip
 
+On macOS::
+
+    brew install autoconf automake libtool openssl pkg-config
+    brew tap homebrew/cask-versions
+    brew cask install homebrew/cask-versions/adoptopenjdk8
+
 Installing Android SDK
 ~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/doc/source/troubleshooting.rst b/doc/source/troubleshooting.rst
@@ -163,6 +163,17 @@ On Ubuntu fix it my making sure only the :code:`openjdk-8-jdk` package is instal
 In the similar fashion for macOS you need to install the :code:`java8` package::
 
     brew cask install java8
+    export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
+
+
+Error: Cask 'java8' is unavailable: No Cask with this name exists
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to install Java 8 on macOS you may need extra steps::
+
+    brew tap homebrew/cask-versions
+    brew cask install homebrew/cask-versions/adoptopenjdk8
+    export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
 
 
 JNI DETECTED ERROR IN APPLICATION: static jfieldID 0x0000000 not valid for class java.lang.Class<org.renpy.android.PythonActivity>
@@ -173,12 +184,6 @@ This error appears in the logcat log if you try to access
 fix it, change your code to reference
 ``org.kivy.android.PythonActivity`` instead.
 
-websocket-client: if you see errors relating to 'SSL not available'
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Ensure you have the package backports.ssl-match-hostname in the buildozer requirements, since Kivy targets python 2.7.x
-
-You may also need sslopt={"cert_reqs": ssl.CERT_NONE} as a parameter to ws.run_forever() if you get an error relating to host verification
-
 Requested API target 19 is not available, install it with the SDK android tool
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -197,3 +202,20 @@ ModuleNotFoundError: No module named '_ctypes'
 You do not have the libffi headers available to python-for-android, so you need to install them. On Ubuntu and derivatives these come from the `libffi-dev` package.
 
 After installing the headers, clean the build (`p4a clean builds`, or with buildozer delete the `.buildozer` directory within your app directory) and run python-for-android again.
+
+SSLError("Can't connect to HTTPS URL because the SSL module is not available.")
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Your `hostpython3` was compiled without SSL support. You need to install the SSL development files before rebuilding the `hostpython3` recipe.
+Remember to always clean the build before rebuilding (`p4a clean builds`, or with buildozer `buildozer android clean`).
+
+On Ubuntu and derivatives::
+
+    apt install libssl-dev
+    p4a clean builds # or with: buildozer `buildozer android clean
+
+On macOS::
+
+    brew install openssl
+    sudo ln -sfn /usr/local/opt/openssl /usr/local/ssl
+    p4a clean builds # or with: buildozer `buildozer android clean
diff --git a/pythonforandroid/__init__.py b/pythonforandroid/__init__.py
@@ -1 +1 @@
-__version__ = '2020.04.29'
+__version__ = '2020.06.02'
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -145,9 +145,9 @@ def get_env(self, with_flags_in_cc=True):
             + " ".join(
                 [
                     "-L'"
-                    + l.replace("'", "'\"'\"'")
+                    + link_path.replace("'", "'\"'\"'")
                     + "'"  # no shlex.quote in py2
-                    for l in self.extra_global_link_paths
+                    for link_path in self.extra_global_link_paths
                 ]
             )
             + ' ' + ' '.join(self.common_ldflags).format(

diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -132,9 +132,6 @@ def get_build_dir(self):
     def get_dist_dir(self, name):
         return join(self.ctx.dist_dir, name)
 
-    def get_common_dir(self):
-        return os.path.abspath(join(self.bootstrap_dir, "..", 'common'))
-
     @property
     def name(self):
         modname = self.__class__.__module__
@@ -152,6 +149,23 @@ def get_bootstrap_dirs(self):
         ]
         return bootstrap_dirs
 
+    def _copy_in_final_files(self):
+        if self.name == "sdl2":
+            # Get the paths for copying SDL2's java source code:
+            sdl2_recipe = Recipe.get_recipe("sdl2", self.ctx)
+            sdl2_build_dir = sdl2_recipe.get_jni_dir()
+            src_dir = join(sdl2_build_dir, "SDL", "android-project",
+                           "app", "src", "main", "java",
+                           "org", "libsdl", "app")
+            target_dir = join(self.dist_dir, 'src', 'main', 'java', 'org',
+                              'libsdl', 'app')
+
+            # Do actual copying:
+            info('Copying in SDL2 .java files from: ' + str(src_dir))
+            if not os.path.exists(target_dir):
+                os.makedirs(target_dir)
+            copy_files(src_dir, target_dir, override=True)
+
     def prepare_build_dir(self):
         """Ensure that a build dir exists for the recipe. This same single
         dir will be used for building all different archs."""
@@ -168,7 +182,12 @@ def prepare_build_dir(self):
     def prepare_dist_dir(self):
         ensure_dir(self.dist_dir)
 
-    def run_distribute(self):
+    def assemble_distribution(self):
+        ''' Copies all the files into the distribution (this function is
+            overridden by the specific bootstrap classes to do this)
+            and add in the distribution info.
+        '''
+        self._copy_in_final_files()
         self.distribution.save_info(self.dist_dir)
 
     @classmethod
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '2020.04.29'
		__version__ = '2020.06.02'