Mercurial > libervia-desktop

changeset 316:86566968837a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
android (p4a): updated P4A option to use Python 3: - hostpython3 is now used so we are using Python 3 - added pyasn1 and pyasn1-modules which were lacking - recent p4a now use setup.py, this is currently disabled to keep the building working
author Goffi <goffi@goffi.org>
date Wed, 16 Oct 2019 08:48:32 +0200
parents 4c1df075378c
children 4b0fa73caad4
files .p4a cagou/core/cagou_main.py
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.p4a	Sun Aug 25 12:17:56 2019 +0200
+++ b/.p4a	Wed Oct 16 08:48:32 2019 +0200
@@ -4,7 +4,7 @@
 --dist-name cagou_dev_build
 --debug
 --bootstrap=sdl2
---requirements "hostpython2, kivy, sqlite3, omemo, omemo-backend-signal, service_identity, automat, attrs, twisted, wokkel, hg+https://repos.goffi.org/sat, hg+https://repos.goffi.org/sat_tmp, pil, pyxdg, markdown, html2text, python-dateutil, pycrypto, plyer, android, python-potr, shortuuid, babel, lxml, pudb, urwid, cryptography, openssl, pyopenssl"
+--requirements "hostpython3, kivy, sqlite3, omemo, omemo-backend-signal, service_identity, automat, attrs, twisted, wokkel, hg+https://repos.goffi.org/sat, hg+https://repos.goffi.org/sat_tmp, pil, pyxdg, markdown, html2text, python-dateutil, pycrypto, plyer, android, python-potr, shortuuid, babel, lxml, pudb, urwid, cryptography, openssl, pyopenssl, pyasn1, pyasn1-modules"
 --private . --package=org.salutatoi.cagou --name "Cagou"
 --version 0.1
 --whitelist .p4a_whitelist
@@ -20,3 +20,4 @@
 --permission RECORD_AUDIO
 --permission READ_EXTERNAL_STORAGE
 --permission WRITE_EXTERNAL_STORAGE
+--ignore-setup-py
--- a/cagou/core/cagou_main.py	Sun Aug 25 12:17:56 2019 +0200
+++ b/cagou/core/cagou_main.py	Wed Oct 16 08:48:32 2019 +0200
@@ -413,10 +413,10 @@
 
         bridge_module = dynamic_import.bridge(bridge_name, 'sat_frontends.bridge')
         if bridge_module is None:
-            log.error("Can't import {} bridge".format(bridge_name))
+            log.error(f"Can't import {bridge_name} bridge")
             sys.exit(3)
         else:
-            log.debug("Loading {} bridge".format(bridge_name))
+            log.debug(f"Loading {bridge_name} bridge")
         super(Cagou, self).__init__(bridge_factory=bridge_module.Bridge,
                                     xmlui=xmlui,
                                     check_options=quick_utils.check_options,
@@ -572,7 +572,7 @@
 
         for kv_file in kv_files:
             Builder.load_file(kv_file)
-            log.debug("kv file {} loaded".format(kv_file))
+            log.debug(f"kv file {kv_file} loaded")
 
     def _import_plugins(self):
         """import all plugins"""