Merge branch 'master' into doc_and_cosmetics

Author: Zen-CODE

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--
 The issue tracker is a tool to address bugs.
-Please use the #kivy IRC channel on freenode or Stack Overflow for
-support questions, more information at https://github.com/kivy/python-for-android#support
+Please use the Disord 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

.travis.yml

@@ -7,7 +7,8 @@ services:
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq python-tox
+  - sudo apt-get install -qq python2.7 python3
+  - sudo pip install tox>=2.0
 
 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'

Dockerfile

@@ -11,7 +11,7 @@
 # TODO:
 #	- delete archives to keep small the container small
 #	- setup caching (for apt, pip, ndk, sdk and p4a recipes downloads)
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 
 # get the latest version from https://developer.android.com/ndk/downloads/index.html

README.rst

@@ -75,11 +75,7 @@ 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
+We also have `#support Discord channel <https://chat.kivy.org/>`_.
 
 Contributing
 ============
@@ -94,11 +90,7 @@ 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
+We also have `#dev Discord channel <https://chat.kivy.org/>`_.
 
 License
 =======

doc/source/services.rst

@@ -68,15 +68,23 @@ code), you must use PyJNIus to interact with the java class
 python-for-android creates for each one, as follows::
 
     from jnius import autoclass
-    service = autoclass('your.package.name.ServiceMyservice')
+    service = autoclass('your.package.domain.package.name.ServiceMyservice')
     mActivity = autoclass('org.kivy.android.PythonActivity').mActivity
     argument = ''
     service.start(mActivity, argument)
 
-Here, ``your.package.name`` refers to the package identifier of your
-APK as set by the ``--package`` argument to python-for-android, and
-the name of the service is ``ServiceMyservice``, in which ``Myservice``
-is the identifier that was previously passed to the ``--service``
+Here, ``your.package.domain.package.name`` refers to the package identifier
+of your APK. 
+
+If you are using buildozer, the identifier is set by the ``package.name``
+and ``package.domain`` values in your buildozer.spec file.
+The name of the service is ``ServiceMyservice``, where ``Myservice``
+is the name specied by one of the ``services`` values, but with the first
+letter upper case. 
+
+If you are using python-for-android directly, the identifier is set by the ``--package``
+argument to python-for-android. The name of the service is ``ServiceMyservice``,
+where ``Myservice`` is the identifier that was previously passed to the ``--service``
 argument, but with the first letter upper case. You must also pass the
 ``argument`` parameter even if (as here) it is an empty string. If you
 do pass it, the service can make use of this argument.

doc/source/troubleshooting.rst

@@ -10,7 +10,7 @@ Add the ``--debug`` option to any python-for-android command to see
 full debug output including the output of all the external tools used
 in the compilation and packaging steps.
 
-If reporting a problem by email or irc, it is usually helpful to
+If reporting a problem by email or Discord, it is usually helpful to
 include this full log, via e.g. a `pastebin
 <http://paste.ubuntu.com/>`_ or `Github gist
 <https://gist.github.com/>`_.
@@ -23,7 +23,7 @@ get help with any problems using the same channels as Kivy itself:
 
 - by email to the `kivy-users Google group
   <https://groups.google.com/forum/#!forum/kivy-users>`_
-- by irc in the #kivy room at irc.freenode.net
+- on `#support Discord channel <https://chat.kivy.org/>`_
 
 If you find a bug, you can also post an issue on the
 `python-for-android Github page

pythonforandroid/bdistapk.py

@@ -136,7 +136,7 @@ def _set_user_options():
     for i, arg in enumerate(sys.argv):
         if arg.startswith('--'):
             if ('=' in arg or
-                (i < (len(sys.argv) - 1) and not sys.argv[i+1].startswith('-'))):
+                    (i < (len(sys.argv) - 1) and not sys.argv[i+1].startswith('-'))):
                 user_options.append((arg[2:].split('=')[0] + '=', None, None))
             else:
                 user_options.append((arg[2:], None, None))

pythonforandroid/bootstraps/pygame/__init__.py

@@ -54,7 +54,7 @@ def run_distribute(self):
             if not exists('python-install'):
                 shprint(sh.cp, '-a', self.ctx.get_python_install_dir(), './python-install')
 
-            self.distribute_libs(arch, [join(self.build_dir, 'libs', arch.arch), self.ctx.get_libs_dir(arch.arch)]);
+            self.distribute_libs(arch, [join(self.build_dir, 'libs', arch.arch), self.ctx.get_libs_dir(arch.arch)])
             self.distribute_aars(arch)
             self.distribute_javaclasses(self.ctx.javaclass_dir)
 

pythonforandroid/bootstraps/pygame/build/build.py

@@ -133,10 +133,10 @@ def select(fn):
         fn = realpath(fn)
         assert(fn.startswith(d))
         fn = fn[len(d):]
-        if (fn.startswith('/site-packages/') or
-            fn.startswith('/config/') or
-            fn.startswith('/lib-dynload/') or
-            fn.startswith('/libpymodules.so')):
+        if (fn.startswith('/site-packages/')
+                or fn.startswith('/config/')
+                or fn.startswith('/lib-dynload/')
+                or fn.startswith('/libpymodules.so')):
             return False
         return fn
 
@@ -183,7 +183,6 @@ def select(fn):
     tf = tarfile.open(tfn, 'w:gz', format=tarfile.USTAR_FORMAT)
     dirs = []
     for fn, afn in files:
-#         print('%s: %s' % (tfn, fn))
         dn = dirname(afn)
         if dn not in dirs:
             # create every dirs first if not exist yet

pythonforandroid/bootstraps/pygame/build/buildlib/argparse.py

@@ -651,8 +651,8 @@ def _split_lines(self, text, width):
 
     def _fill_text(self, text, width, indent):
         text = self._whitespace_matcher.sub(' ', text).strip()
-        return _textwrap.fill(text, width, initial_indent=indent,
-                                           subsequent_indent=indent)
+        return _textwrap.fill(
+            text, width, initial_indent=indent, subsequent_indent=indent)
 
     def _get_help_string(self, action):
         return action.help
@@ -705,7 +705,7 @@ def _get_action_name(argument):
     if argument is None:
         return None
     elif argument.option_strings:
-        return  '/'.join(argument.option_strings)
+        return '/'.join(argument.option_strings)
     elif argument.metavar not in (None, SUPPRESS):
         return argument.metavar
     elif argument.dest not in (None, SUPPRESS):
@@ -2070,8 +2070,8 @@ def _parse_optional(self, arg_string):
 
         # if multiple actions match, the option string was ambiguous
         if len(option_tuples) > 1:
-            options = ', '.join([option_string
-                for action, option_string, explicit_arg in option_tuples])
+            options = ', '.join(
+                    [option_string for action, option_string, explicit_arg in option_tuples])
             tup = arg_string, options
             self.error(_('ambiguous option: %s could match %s') % tup)