Merge pull request #2488 from misl6/release-2021.09.05

Release 2021.09.05

.env

@@ -1,7 +1,10 @@
 # used by coveralls.io, refs:
-# https://coveralls-python.readthedocs.io/en/latest/usage/tox.html#travisci
+# https://coveralls-python.readthedocs.io/en/latest/usage/tox.html#github-actions
 CI
-TRAVIS
-TRAVIS_BRANCH
-TRAVIS_JOB_ID
-TRAVIS_PULL_REQUEST
+GITHUB_ACTIONS
+GITHUB_REF
+GITHUB_SHA
+GITHUB_HEAD_REF
+GITHUB_REPOSITORY
+GITHUB_RUN_ID
+GITHUB_TOKEN

.github/workflows/push.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Checkout python-for-android
       uses: actions/checkout@v2
     - name: Set up Python 3.7
-      uses: actions/setup-python@v1.1.0
+      uses: actions/setup-python@v2.2.1
       with:
         python-version: 3.7
     - name: Run flake8
@@ -32,7 +32,7 @@ jobs:
     - name: Checkout python-for-android
       uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1.1.0
+      uses: actions/setup-python@v2.2.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Tox tests

.github/workflows/pypi-release.yml

@@ -0,0 +1,25 @@
+name: PyPI release
+on: [push]
+
+jobs:
+  pypi_release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.x
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade setuptools wheel twine
+    - name: Build
+      run: |
+        python setup.py sdist bdist_wheel
+        twine check dist/*
+    - name: Publish package
+      if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+      uses: pypa/[email protected]
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_password }}

Dockerfile

@@ -45,7 +45,7 @@ ENV HOME_DIR="/home/${USER}"
 ENV WORK_DIR="${HOME_DIR}/app" \
     PATH="${HOME_DIR}/.local/bin:${PATH}" \
     ANDROID_HOME="${HOME_DIR}/.android" \
-    JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+    JAVA_HOME="/usr/lib/jvm/java-13-openjdk-amd64"
 
 
 # install system dependencies
@@ -69,7 +69,7 @@ RUN dpkg --add-architecture i386 \
     libssl-dev \
     libstdc++6:i386 \
     libtool \
-    openjdk-8-jdk \
+    openjdk-13-jdk \
     patch \
     pkg-config \
     python3 \
@@ -98,8 +98,8 @@ RUN mkdir ${ANDROID_HOME} && chown --recursive ${USER} ${HOME_DIR} ${ANDROID_HOM
 USER ${USER}
 
 # Download and install android's NDK/SDK
-COPY ci/makefiles/android.mk /tmp/android.mk
-RUN make --file /tmp/android.mk target_os=linux \
+COPY --chown=user:user ci/makefiles/android.mk /tmp/android.mk
+RUN make --file /tmp/android.mk \
     && sudo rm /tmp/android.mk
 
 # install python-for-android from current branch

MANIFEST.in

@@ -6,7 +6,7 @@ recursive-include doc *
 prune doc/build
 
 recursive-include pythonforandroid *.py *.tmpl biglink liblink
-recursive-include pythonforandroid/recipes *.py *.patch *.c *.pyx Setup *.h
+recursive-include pythonforandroid/recipes *.py *.patch *.diff *.c *.pyx Setup *.h
 
 recursive-include pythonforandroid/bootstraps *.properties *.xml *.java *.tmpl *.txt *.png *.aidl *.py *.sh *.c *.h *.html *.patch
 

Makefile

@@ -20,7 +20,7 @@ all: virtualenv
 
 $(VIRTUAL_ENV):
 	python3 -m venv $(VIRTUAL_ENV)
-	$(PIP) install Cython==0.29.19
+	$(PIP) install Cython
 	$(PIP) install -e .
 
 virtualenv: $(VIRTUAL_ENV)

README.md

@@ -1,7 +1,6 @@
 python-for-android
 ==================
 
-[![Build Status](https://travis-ci.org/kivy/python-for-android.svg?branch=develop)](https://travis-ci.org/kivy/python-for-android)
 [![Unit tests & build apps](https://github.com/kivy/python-for-android/workflows/Unit%20tests%20&%20build%20apps/badge.svg?branch=develop)](https://github.com/kivy/python-for-android/actions?query=workflow%3A%22Unit+tests+%26+build+apps%22)
 [![Coverage Status](https://coveralls.io/repos/github/kivy/python-for-android/badge.svg?branch=develop&kill_cache=1)](https://coveralls.io/github/kivy/python-for-android?branch=develop)
 [![Backers on Open Collective](https://opencollective.com/kivy/backers/badge.svg)](#backers)

ci/constants.py

@@ -26,6 +26,8 @@ class TargetPython(Enum):
     # mpmath package with a version >= 0.19 required
     'sympy',
     'vlc',
+    # need extra gfortran NDK system add-on
+    'lapack', 'scipy',
 ])
 
 BROKEN_RECIPES = {

ci/makefiles/android.mk

@@ -1,24 +1,28 @@
 # Downloads and installs the Android SDK depending on supplied platform: darwin or linux
 
-# We must provide a platform (darwin or linux) and we need JAVA_HOME defined
-ifndef target_os
-    $(error target_os is not set...aborted!)
-endif
-
 # Those android NDK/SDK variables can be override when running the file
 ANDROID_NDK_VERSION ?= 19b
-ANDROID_SDK_TOOLS_VERSION ?= 4333796
-ANDROID_SDK_BUILD_TOOLS_VERSION ?= 28.0.2
+ANDROID_SDK_TOOLS_VERSION ?= 6514223
+ANDROID_SDK_BUILD_TOOLS_VERSION ?= 29.0.3
 ANDROID_HOME ?= $(HOME)/.android
 ANDROID_API_LEVEL ?= 27
 
+# per OS dictionary-like
+UNAME_S := $(shell uname -s)
+TARGET_OS_Linux = linux
+TARGET_OS_ALIAS_Linux = $(TARGET_OS_Linux)
+TARGET_OS_Darwin = darwin
+TARGET_OS_ALIAS_Darwin = mac
+TARGET_OS = $(TARGET_OS_$(UNAME_S))
+TARGET_OS_ALIAS = $(TARGET_OS_ALIAS_$(UNAME_S))
+
 ANDROID_SDK_HOME=$(ANDROID_HOME)/android-sdk
-ANDROID_SDK_TOOLS_ARCHIVE=sdk-tools-$(target_os)-$(ANDROID_SDK_TOOLS_VERSION).zip
+ANDROID_SDK_TOOLS_ARCHIVE=commandlinetools-$(TARGET_OS_ALIAS)-$(ANDROID_SDK_TOOLS_VERSION)_latest.zip
 ANDROID_SDK_TOOLS_DL_URL=https://dl.google.com/android/repository/$(ANDROID_SDK_TOOLS_ARCHIVE)
 
 ANDROID_NDK_HOME=$(ANDROID_HOME)/android-ndk
 ANDROID_NDK_FOLDER=$(ANDROID_HOME)/android-ndk-r$(ANDROID_NDK_VERSION)
-ANDROID_NDK_ARCHIVE=android-ndk-r$(ANDROID_NDK_VERSION)-$(target_os)-x86_64.zip
+ANDROID_NDK_ARCHIVE=android-ndk-r$(ANDROID_NDK_VERSION)-$(TARGET_OS)-x86_64.zip
 ANDROID_NDK_DL_URL=https://dl.google.com/android/repository/$(ANDROID_NDK_ARCHIVE)
 
 $(info Target install OS is          : $(target_os))
@@ -61,8 +65,8 @@ extract_android_ndk:
 # updates Android SDK, install Android API, Build Tools and accept licenses
 update_android_sdk:
 	touch $(ANDROID_HOME)/repositories.cfg
-	yes | $(ANDROID_SDK_HOME)/tools/bin/sdkmanager --licenses > /dev/null
-	$(ANDROID_SDK_HOME)/tools/bin/sdkmanager "build-tools;$(ANDROID_SDK_BUILD_TOOLS_VERSION)" > /dev/null
-	$(ANDROID_SDK_HOME)/tools/bin/sdkmanager "platforms;android-$(ANDROID_API_LEVEL)" > /dev/null
+	yes | $(ANDROID_SDK_HOME)/tools/bin/sdkmanager --sdk_root=$(ANDROID_SDK_HOME) --licenses > /dev/null
+	$(ANDROID_SDK_HOME)/tools/bin/sdkmanager --sdk_root=$(ANDROID_SDK_HOME) "build-tools;$(ANDROID_SDK_BUILD_TOOLS_VERSION)" > /dev/null
+	$(ANDROID_SDK_HOME)/tools/bin/sdkmanager --sdk_root=$(ANDROID_SDK_HOME) "platforms;android-$(ANDROID_API_LEVEL)" > /dev/null
 	# Set avdmanager permissions (executable)
 	chmod +x $(ANDROID_SDK_HOME)/tools/bin/avdmanager

ci/makefiles/osx.mk

@@ -7,15 +7,15 @@ all: install_java upgrade_cython install_android_ndk_sdk install_p4a
 
 install_java:
 	brew tap adoptopenjdk/openjdk
-	brew cask install adoptopenjdk8
+	brew install --cask adoptopenjdk13
 	/usr/libexec/java_home -V
 
 upgrade_cython:
-	pip3 install --upgrade Cython==0.29.19
+	pip3 install --upgrade Cython
 
 install_android_ndk_sdk:
 	mkdir -p $(ANDROID_HOME)
-	make -f ci/makefiles/android.mk target_os=darwin JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+	make -f ci/makefiles/android.mk JAVA_HOME=`/usr/libexec/java_home -v 13`
 
 install_p4a:
 	# check python version and install p4a