Added flatpak build manifests with split dependencies

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/flatpak/shared-modules"]
+	path = packages/flatpak/shared-modules
+	url = https://github.com/flathub/shared-modules.git

.travis.yml

@@ -18,5 +18,5 @@ install:
   - export PYTHONWARNINGS=all
 script:
   - python checkdeps.py
-  - python src/bitmessagemain.py -t
+  - xvfb-run src/bitmessagemain.py -t
   - python -bm tests

packages/flatpak/org.bitmessage.BaseApp.json

@@ -0,0 +1,57 @@
+{
+ "id": "org.bitmessage.BaseApp",
+ "branch": "19.08",
+ "runtime": "org.freedesktop.Platform",
+ "sdk": "org.freedesktop.Sdk",
+ "runtime-version": "19.08",
+ "separate-locales": false,
+ "modules": [
+  "shared-modules/python2.7/python-2.7.json",
+  "shared-modules/qt4/qt4-4.8.7-minimal.json",
+  {
+    "name": "python-sip",
+    "sources": [
+      {
+        "type": "archive",
+        "url": "https://www.riverbankcomputing.com/static/Downloads/sip/4.19.25/sip-4.19.25.tar.gz",
+        "sha256": "b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211"
+      }
+    ],
+    "buildsystem": "simple",
+    "build-commands": [
+      "python configure.py --sip-module PyQt4.sip --no-dist-info",
+      "make",
+      "make install"
+    ]
+  },
+  {
+    "name": "python-qt4",
+    "sources": [
+      {
+        "type": "archive",
+        "url": "http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.3/PyQt4_gpl_x11-4.12.3.tar.gz",
+        "sha256": "a00f5abef240a7b5852b7924fa5fdf5174569525dc076cd368a566619e56d472"
+      }
+    ],
+    "buildsystem": "simple",
+    "build-commands": [
+      "python configure.py -w --confirm-license",
+      "make",
+      "make install"
+    ]
+  },
+  {
+    "name" : "PyBitmessage-dependencies",
+    "buildsystem" : "simple",
+    "build-options": {
+      "build-args": [
+        "--share=network"
+      ]
+    },
+    "build-commands": [
+      "pip --version",
+      "pip install setuptools msgpack"
+    ]
+  }
+ ]
+}

packages/flatpak/org.bitmessage.PyBitmessage.json

@@ -0,0 +1,48 @@
+{
+    "app-id": "org.bitmessage.PyBitmessage",
+    "runtime": "org.freedesktop.Platform",
+    "runtime-version": "19.08",
+    "branch": "stable",
+    "sdk": "org.freedesktop.Sdk",
+    "base": "org.bitmessage.BaseApp",
+    "command": "pybitmessage",
+    "base-version":"stable",
+    "finish-args" : [
+      "--share=network",
+      "--socket=x11",
+      "--share=ipc",
+      "--filesystem=xdg-config/PyBitmessage:create"
+    ],
+    "modules": [
+      {
+        "name" : "PyBitmessage",
+        "buildsystem" : "simple",
+        "build-options": {
+          "build-args": [
+            "--share=network"
+          ]
+        },
+        "build-commands": [
+          "python --version",
+          "pwd",
+          "ls",
+          "python checkdeps.py",
+          "python setup.py install --prefix=/app --exec-prefix=/app",
+          "sed -i 's~/usr/bin/~/app/bin/~' /app/bin/pybitmessage",
+          "cat /app/bin/pybitmessage",
+          "mv /app/share/applications/pybitmessage.desktop /app/share/applications/org.bitmessage.PyBitmessage.desktop",
+          "sed -i 's~Icon=pybitmessage~Icon=org.bitmessage.PyBitmessage~' /app/share/applications/org.bitmessage.PyBitmessage.desktop",
+          "mv /app/share/icons/hicolor/scalable/apps/pybitmessage.svg /app/share/icons/hicolor/scalable/apps/org.bitmessage.PyBitmessage.svg",
+          "mv /app/share/icons/hicolor/24x24/apps/pybitmessage.png /app/share/icons/hicolor/24x24/apps/org.bitmessage.PyBitmessage.png",
+          "which pybitmessage"
+        ],
+        "sources" : [
+          {
+            "type" : "dir",
+            "path" : "../../"
+          }
+        ]
+      }
+    ]
+  }
+  

packages/flatpak/shared-modules

@@ -0,0 +1 @@
+Subproject commit fd4d38328ccb078b88ad4a891807e593ae8de806

requirements.txt

@@ -2,4 +2,3 @@ coverage
 python_prctl
 psutil
 pycrypto
-xvfbwrapper;platform_system=="Linux"

src/bitmessageqt/tests/main.py

@@ -2,7 +2,6 @@
 
 import Queue
 import sys
-import os
 import unittest
 
 from PyQt4 import QtCore, QtGui
@@ -24,22 +23,6 @@ class TestBase(unittest.TestCase):
             self.window = bitmessageqt.MyForm()
             self.window.appIndicatorInit(self.app)
 
-    def take_screenshot(self, window=None):
-        """Take a screenshot of the *window* or main window if not set"""
-        def save_screenshot():
-            """Save screenshot and quit app clause"""
-            screenshot = QtGui.QPixmap.grabWindow(
-                self.app.desktop().winId())
-            screenshot.save(os.path.join(
-                bitmessageqt.state.appdata, '%s.png' % self.id()))
-            self.app.quit()
-
-        timer = QtCore.QTimer()
-        timer.timeout.connect(save_screenshot)
-        timer.start(200)
-        (window or self.window).show()
-        self.app.exec_()
-
     def tearDown(self):
         # self.app.deleteLater()
         while True:
@@ -72,4 +55,6 @@ class TestUISignaler(TestBase):
                 _translate("test", "Testing updateStatusBar..."), 1)
         ))
 
-        self.take_screenshot()
+        QtCore.QTimer.singleShot(60, self.app.quit)
+        self.app.exec_()
+        # self.app.processEvents(QtCore.QEventLoop.AllEvents, 60)

src/bitmessageqt/tests/support.py

@@ -31,5 +31,3 @@ class TestSupport(TestBase):
             ui.lineEditSubject.text(), self.SUPPORT_SUBJECT)
         self.assertIn(
             sys.version, ui.textEditMessage.toPlainText())
-
-        self.take_screenshot()

src/bmconfigparser.py

@@ -2,13 +2,22 @@
 BMConfigParser class definition and default configuration settings
 """
 
-import ConfigParser
+import sys
+if sys.version_info[0] == 3:
+    # python 3
+    import configparser as ConfigParser
+    SafeConfigParser = ConfigParser.ConfigParser
+else:
+    # python 2
+    import ConfigParser
+    SafeConfigParser = ConfigParser.SafeConfigParser
+
+import state
+from singleton import Singleton
 import os
 import shutil
 from datetime import datetime
 
-import state
-from singleton import Singleton
 
 BMConfigDefaults = {
     "bitmessagesettings": {
@@ -43,7 +52,8 @@ BMConfigDefaults = {
 
 
 @Singleton
-class BMConfigParser(ConfigParser.SafeConfigParser):
+class BMConfigParser(SafeConfigParser):
+
     """
     Singleton class inherited from :class:`ConfigParser.SafeConfigParser`
     with additional methods specific to bitmessage config.
@@ -60,26 +70,47 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
             raise ValueError("Invalid value %s" % value)
         return ConfigParser.ConfigParser.set(self, section, option, value)
 
-    def get(self, section, option, raw=False, variables=None):
+    def get(self, section, option, raw=False, vars=None):
-        # pylint: disable=arguments-differ
+        if sys.version_info[0] == 3:
-        try:
+            # pylint: disable=arguments-differ
-            if section == "bitmessagesettings" and option == "timeformat":
+           try:
+                if section == "bitmessagesettings" and option == "timeformat":
+                    return ConfigParser.ConfigParser.get(
+                        self, section, option)
+                try:
+                    return self._temp[section][option]
+                except KeyError:
+                    pass
                 return ConfigParser.ConfigParser.get(
-                    self, section, option, raw, variables)
+                    self, section, option)
+           except ConfigParser.InterpolationError:
+                return ConfigParser.ConfigParser.get(
+                    self, section, option)
+           except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) as e:
+                try:
+                    return BMConfigDefaults[section][option]
+                except (KeyError, ValueError, AttributeError):
+                    raise e
+        else:
+            # pylint: disable=arguments-differ
             try:
-                return self._temp[section][option]
+                if section == "bitmessagesettings" and option == "timeformat":
-            except KeyError:
+                    return ConfigParser.ConfigParser.get(
-                pass
+                        self, section, option, raw, vars)
-            return ConfigParser.ConfigParser.get(
+                try:
-                self, section, option, True, variables)
+                    return self._temp[section][option]
-        except ConfigParser.InterpolationError:
+                except KeyError:
-            return ConfigParser.ConfigParser.get(
+                    pass
-                self, section, option, True, variables)
+                return ConfigParser.ConfigParser.get(
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) as e:
+                    self, section, option, True, vars)
-            try:
+            except ConfigParser.InterpolationError:
-                return BMConfigDefaults[section][option]
+                return ConfigParser.ConfigParser.get(
-            except (KeyError, ValueError, AttributeError):
+                    self, section, option, True, vars)
-                raise e
+            except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) as e:
+                try:
+                    return BMConfigDefaults[section][option]
+                except (KeyError, ValueError, AttributeError):
+                    raise e
 
     def setTemp(self, section, option, value=None):
         """Temporary set option to value, not saving."""
@@ -191,3 +222,4 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
         if value < 0 or value > 8:
             return False
         return True
+

src/tests/core.py

@@ -3,7 +3,6 @@ Tests for core and those that do not work outside
 (because of import error for example)
 """
 
-import atexit
 import os
 import pickle  # nosec
 import Queue
@@ -399,9 +398,8 @@ def run():
     suite = loader.loadTestsFromTestCase(TestCore)
     try:
         import bitmessageqt.tests
-        from xvfbwrapper import Xvfb
     except ImportError:
-        Xvfb = None
+        pass
     else:
         qt_tests = loader.loadTestsFromModule(bitmessageqt.tests)
         suite.addTests(qt_tests)
@@ -412,8 +410,4 @@ def run():
 
     sys.excepthook = keep_exc
 
-    if Xvfb:
-        vdisplay = Xvfb(width=1024, height=768)
-        vdisplay.start()
-        atexit.register(vdisplay.stop)
     return unittest.TextTestRunner(verbosity=2).run(suite)

src/tests/test_config.py

@@ -2,11 +2,7 @@
 Various tests for config
 """
 
-import os
 import unittest
-import tempfile
-
-from .test_process import TestProcessProto
 from pybitmessage.bmconfigparser import BMConfigParser
 
 
@@ -38,32 +34,3 @@ class TestConfig(unittest.TestCase):
             BMConfigParser().safeGetInt('nonexistent', 'nonexistent'), 0)
         self.assertEqual(
             BMConfigParser().safeGetInt('nonexistent', 'nonexistent', 42), 42)
-
-
-class TestProcessConfig(TestProcessProto):
-    """A test case for keys.dat"""
-    home = tempfile.mkdtemp()
-
-    def test_config_defaults(self):
-        """Test settings in the generated config"""
-        self._stop_process()
-        self._kill_process()
-        config = BMConfigParser()
-        config.read(os.path.join(self.home, 'keys.dat'))
-
-        self.assertEqual(config.safeGetInt(
-            'bitmessagesettings', 'settingsversion'), 10)
-        self.assertEqual(config.safeGetInt(
-            'bitmessagesettings', 'port'), 8444)
-        # don't connect
-        self.assertTrue(config.safeGetBoolean(
-            'bitmessagesettings', 'dontconnect'))
-        # API disabled
-        self.assertFalse(config.safeGetBoolean(
-            'bitmessagesettings', 'apienabled'))
-
-        # extralowdifficulty is false
-        self.assertEqual(config.safeGetInt(
-            'bitmessagesettings', 'defaultnoncetrialsperbyte'), 1000)
-        self.assertEqual(config.safeGetInt(
-            'bitmessagesettings', 'defaultpayloadlengthextrabytes'), 1000)

src/tests/test_config_process.py

@@ -0,0 +1,38 @@
+"""
+Various tests for config
+"""
+
+import os
+import tempfile
+from pybitmessage.bmconfigparser import BMConfigParser
+from .test_process import TestProcessProto
+
+
+class TestProcessConfig(TestProcessProto):
+    """A test case for keys.dat"""
+    home = tempfile.mkdtemp()
+
+
+    def test_config_defaults(self):
+        """Test settings in the generated config"""
+        config = BMConfigParser()
+        self._stop_process()
+        self._kill_process()
+        config.read(os.path.join(self.home, 'keys.dat'))
+
+        self.assertEqual(config.safeGetInt(
+            'bitmessagesettings', 'settingsversion'), 10)
+        self.assertEqual(config.safeGetInt(
+            'bitmessagesettings', 'port'), 8444)
+        # don't connect
+        self.assertTrue(config.safeGetBoolean(
+            'bitmessagesettings', 'dontconnect'))
+        # API disabled
+        self.assertFalse(config.safeGetBoolean(
+            'bitmessagesettings', 'apienabled'))
+
+        # extralowdifficulty is false
+        self.assertEqual(config.safeGetInt(
+            'bitmessagesettings', 'defaultnoncetrialsperbyte'), 1000)
+        self.assertEqual(config.safeGetInt(
+            'bitmessagesettings', 'defaultpayloadlengthextrabytes'), 1000)