Merge branch 'master' into update_contributing_doc

Author: inclement

.coveragerc

@@ -0,0 +1,10 @@
+[run]
+omit =
+    *test*
+
+[report]
+exclude_lines =
+    pragma: no cover
+    def __repr__
+    raise NotImplementedError
+    if __name__ == .__main__.:

.travis.yml

@@ -4,14 +4,22 @@ dist: xenial  # needed for more recent python 3 and python3-venv
 
 language: generic
 
+stages:
+  - lint
+  - test
+
 services:
   - docker
 
 before_install:
   - travis_retry sudo apt update -qq
-  - travis_retry sudo apt install -qq --no-install-recommends python2.7 python3 python3-venv python3-virtualenv
+  # to successfully send the coveralls reports we need pyOpenSSL
+  - travis_retry sudo apt install -qq --no-install-recommends
+    python2.7 python3 python3-venv python3-virtualenv python3-pip
+    python3-setuptools python3-openssl
   # (venv/virtualenv are both used by tests/test_pythonpackage.py)
   - sudo pip install tox>=2.0
+  - sudo pip3 install coveralls
   # https://github.com/travis-ci/travis-ci/issues/6069#issuecomment-266546552
   - git remote set-branches --add origin master
   - git fetch
@@ -20,25 +28,42 @@ env:
   global:
     - ANDROID_SDK_HOME=/opt/android/android-sdk
     - ANDROID_NDK_HOME=/opt/android/android-ndk
-  matrix:
-    - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools'
-    # 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 $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools'
-    - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --bootstrap sdl2 --requirements python2,numpy'
-    # builds only the recipes that moved
-    - COMMAND='. venv/bin/activate && ./ci/rebuild_updated_recipes.py'
-
-before_script:
-  # we want to fail fast on tox errors without having to `docker build` first
-  - tox -- tests/ --ignore tests/test_pythonpackage.py
-  # (we ignore test_pythonpackage.py since these run way too long!! test_pythonpackage_basic.py will still be run.)
-
-script:
-  # Run a background process to make sure that travis will not kill our tests in
-  # case that the travis log doesn't produce any output for more than 10 minutes
-  - while sleep 540; do echo "==== Still running (travis, don't kill me) ===="; done &
-  - docker build --tag=p4a --file Dockerfile.py3 .
-  - docker run -e CI p4a /bin/sh -c "$COMMAND"
-  # kill the background process started before run docker
-  - kill %1
+
+jobs:
+  include:
+    - stage: lint
+      name: "Tox tests and coverage"
+      script:
+        # we want to fail fast on tox errors without having to `docker build` first
+        - tox -- tests/ --ignore tests/test_pythonpackage.py
+        # (we ignore test_pythonpackage.py since these run way too long!!
+        #  test_pythonpackage_basic.py will still be run.)
+      after_success:
+        - coveralls
+
+    - &testing
+      stage: test
+      before_script:
+        # build docker image
+        - docker build --tag=p4a --file Dockerfile.py3 .
+        # Run a background process to make sure that travis will not kill our tests in
+        # case that the travis log doesn't produce any output for more than 10 minutes
+        - while sleep 540; do echo "==== Still running (travis, don't kill me) ===="; done &
+      script:
+        - docker run -e CI -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e TRAVIS_BRANCH="$TRAVIS_BRANCH" p4a /bin/sh -c "$COMMAND"
+      after_script:
+        # kill the background process started before run docker
+        - kill %1
+      name: Python 3 basic
+      # overrides requirements to skip `peewee` pure python module, see:
+      # https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
+      env: COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools'
+    - <<: *testing
+      name: Python 2 basic
+      env: COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools'
+    - <<: *testing
+      name: Python 2 numpy
+      env: COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --bootstrap sdl2 --requirements python2,numpy'
+    - <<: *testing
+      name: Rebuild updated recipes
+      env: COMMAND='. venv/bin/activate && ./ci/rebuild_updated_recipes.py'

README.md

@@ -2,8 +2,9 @@ python-for-android
 ==================
 
 [![Build Status](https://travis-ci.org/kivy/python-for-android.svg?branch=master)](https://travis-ci.org/kivy/python-for-android)
-[![Backers on Open Collective](https://opencollective.com/kivy/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/kivy/sponsors/badge.svg)](#sponsors)
+[![Coverage Status](https://coveralls.io/repos/github/kivy/python-for-android/badge.svg?branch=master&kill_cache=1)](https://coveralls.io/github/kivy/python-for-android?branch=master)
+[![Backers on Open Collective](https://opencollective.com/kivy/backers/badge.svg)](#backers) 
+[![Sponsors on Open Collective](https://opencollective.com/kivy/sponsors/badge.svg)](#sponsors) 
 
 python-for-android is a packager for Python apps on Android. You can
 create your own Python distribution including the modules and

pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java

@@ -18,6 +18,10 @@
 
 import org.renpy.android.Hardware;
 
+//imports for channel definition
+import android.app.NotificationManager;
+import android.app.NotificationChannel;
+import android.graphics.Color;
 
 public class PythonService extends Service implements Runnable {
 
@@ -90,13 +94,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     protected void doStartForeground(Bundle extras) {
         String serviceTitle = extras.getString("serviceTitle");
         String serviceDescription = extras.getString("serviceDescription");
-
         Notification notification;
         Context context = getApplicationContext();
         Intent contextIntent = new Intent(context, PythonActivity.class);
         PendingIntent pIntent = PendingIntent.getActivity(context, 0, contextIntent,
             PendingIntent.FLAG_UPDATE_CURRENT);
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
             notification = new Notification(
                 context.getApplicationInfo().icon, serviceTitle, System.currentTimeMillis());
             try {
@@ -109,7 +113,19 @@ protected void doStartForeground(Bundle extras) {
                      IllegalArgumentException | InvocationTargetException e) {
             }
         } else {
-            Notification.Builder builder = new Notification.Builder(context);
+            // for android 8+ we need to create our own channel
+            // https://stackoverflow.com/questions/47531742/startforeground-fail-after-upgrade-to-android-8-1
+            String NOTIFICATION_CHANNEL_ID = "org.kivy.p4a";    //TODO: make this configurable
+            String channelName = "PythonSerice";                //TODO: make this configurable
+            NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, 
+                NotificationManager.IMPORTANCE_NONE);
+            
+            chan.setLightColor(Color.BLUE);
+            chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+            NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+            manager.createNotificationChannel(chan);
+
+            Notification.Builder builder = new Notification.Builder(context, NOTIFICATION_CHANNEL_ID);
             builder.setContentTitle(serviceTitle);
             builder.setContentText(serviceDescription);
             builder.setContentIntent(pIntent);

pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml

@@ -71,11 +71,13 @@
 
         {% if service %}
         <service android:name="org.kivy.android.PythonService"
-                 android:process=":pythonservice" />
+                 android:process=":pythonservice" 
+                 android:exported="true"/>
         {% endif %}
         {% for name in service_names %}
         <service android:name="{{ args.package }}.Service{{ name|capitalize }}"
-                 android:process=":service_{{ name }}" />
+                 android:process=":service_{{ name }}"
+                 android:exported="true" />
         {% endfor %}
 
         {% if args.billing_pubkey %}

pythonforandroid/bootstraps/service_only/build/templates/Service.tmpl.java

@@ -17,7 +17,7 @@ public class Service{{ name|capitalize }} extends PythonService {
      * {@inheritDoc}
      */
     @Override
-    public int getStartType() {
+    public int startType() {
         return START_STICKY;
     }
     {% endif %}

pythonforandroid/recipes/android/__init__.py

@@ -38,9 +38,10 @@ def prebuild_arch(self, arch):
         bootstrap = bootstrap_name = ctx_bootstrap
 
         is_sdl2 = bootstrap_name in ('sdl2', 'sdl2python3', 'sdl2_gradle')
-        is_webview = bootstrap_name in ('webview',)
+        is_webview = bootstrap_name == 'webview'
+        is_service_only = bootstrap_name == 'service_only'
 
-        if is_sdl2 or is_webview:
+        if is_sdl2 or is_webview or is_service_only:
             if is_sdl2:
                 bootstrap = 'sdl2'
             java_ns = u'org.kivy.android'

testapps/setup_testapp_service.py

@@ -7,7 +7,8 @@
                    'blacklist-requirements': 'openssl,sqlite3',
                    'android-api': 27,
                    'ndk-api': 21,
-                   'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
+                   'sdk-dir':'/opt/android/android-sdk/',
+                   'ndk-dir':'/opt/android/android-ndk-r17c/',
                    'dist-name': 'testapp_service',
                    'ndk-version': '10.3.2',
                    'bootstrap': 'service_only',

tox.ini

@@ -7,12 +7,20 @@ deps =
     mock
     pytest
     virtualenv
+    py3: coveralls
 # makes it possible to override pytest args, e.g.
 # tox -- tests/test_graph.py
 commands = pytest {posargs:tests/}
+passenv = TRAVIS TRAVIS_*
 setenv =
     PYTHONPATH={toxinidir}
 
+[testenv:py3]
+# for py3 env we will get code coverage
+commands =
+    coverage run --branch --source=pythonforandroid -m pytest {posargs:tests/}
+    coverage report -m
+
 [testenv:pep8]
 deps = flake8
 commands = flake8 pythonforandroid/ tests/ ci/