removed flatpak

diff --git a/setup.py b/setup.py
index 24a302b020ba50e64961959c9a891f6a12498cbd..43de880f7880352e0b004932466799762d8d48c3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ from ya2.build.images import bld_images
 from ya2.build.screenshots import bld_screenshots
 from ya2.build.lang import LanguageBuilder
 from p3d_appimage import AppImageBuilder
-from p3d_flatpak import FlatpakBuilder
+#from p3d_flatpak import FlatpakBuilder
 import ya2.utils.log  # so logging's info/debug are logged
 from logics.app import PmachinesApp
 
@@ -130,17 +130,17 @@ class BDistAppsCmd(bdist_apps):
             AppImageBuilder(self).build(longname, hbranch,
                                         'https://www.ya2.it/downloads/')
             fbranch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[branch]
-            bld = FlatpakBuilder(
-                self,
-                'it.ya2.Pmachines',
-                '/home/flavio/builders/pmachines_builder/flatpak',
-                'D43B6D401912B520B6805FCC8E019E6340E3BAB5',
-                '/home/flavio/builders/pmachines_builder/gpg',
-                'https://www.ya2.it/flatpak',
-                ['options*.ini'],
-                fbranch,
-                ['assets'])
-            bld.build()
+            # bld = FlatpakBuilder(
+            #     self,
+            #     'it.ya2.Pmachines',
+            #     '/home/flavio/builders/pmachines_builder/flatpak',
+            #     'D43B6D401912B520B6805FCC8E019E6340E3BAB5',
+            #     '/home/flavio/builders/pmachines_builder/gpg',
+            #     'https://www.ya2.it/flatpak',
+            #     ['options*.ini'],
+            #     fbranch,
+            #     ['assets'])
+            # bld.build()
 
 
 if __name__ == '__main__':

diff --git a/tests/test_functional.py b/tests/test_functional.py
index fbd89e0341bef4eebdc8a26c60480ad21492088f..428b69e565e4c505b20409b6a97247d6dfddcbd3 100644 (file)
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -109,23 +109,23 @@ class FunctionalTests(TestCase):
             'timeout 720s ~/venv/bin/python -m tests.functional_test.py 2',
             str(Path.home()) + '/.local/share/pmachines/tests/functional/')
 
-    def test_flatpak(self):
-        info('test_flatpak')
-        if environ.get('FUNCTIONALPOST') != '1':
-            self.skipTest('skipped functional-post tests')
-        bld_branch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
-        cmd = 'flatpak update --user -y it.ya2.Pmachines//%s' % bld_branch
-        info('executing: %s' % cmd)
-        #system(cmd)
-        fout = exec_cmd(cmd)
-        info('executed: %s' % cmd)
-        info(fout)
-        self.__test_template(
-            'timeout 720s flatpak run it.ya2.Pmachines//%s --functional-test & '
-            'timeout 720s ~/venv/bin/python -m tests.functional_test.py 1; sleep 5; '
-            'timeout 720s flatpak run it.ya2.Pmachines//%s --functional-test & ' % (bld_branch, bld_branch) +
-            'timeout 720s ~/venv/bin/python -m tests.functional_test.py 2',
-            str(Path.home()) + '/.var/app/it.ya2.Pmachines/data/pmachines/tests/functional/')
+    # def test_flatpak(self):
+    #     info('test_flatpak')
+    #     if environ.get('FUNCTIONALPOST') != '1':
+    #         self.skipTest('skipped functional-post tests')
+    #     bld_branch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
+    #     cmd = 'flatpak update --user -y it.ya2.Pmachines//%s' % bld_branch
+    #     info('executing: %s' % cmd)
+    #     #system(cmd)
+    #     fout = exec_cmd(cmd)
+    #     info('executed: %s' % cmd)
+    #     info(fout)
+    #     self.__test_template(
+    #         'timeout 720s flatpak run it.ya2.Pmachines//%s --functional-test & '
+    #         'timeout 720s ~/venv/bin/python -m tests.functional_test.py 1; sleep 5; '
+    #         'timeout 720s flatpak run it.ya2.Pmachines//%s --functional-test & ' % (bld_branch, bld_branch) +
+    #         'timeout 720s ~/venv/bin/python -m tests.functional_test.py 2',
+    #         str(Path.home()) + '/.var/app/it.ya2.Pmachines/data/pmachines/tests/functional/')
 
     def __update_itchio(self):
         system('/home/flavio/.itch/itch')
@@ -185,12 +185,12 @@ class FunctionalTests(TestCase):
             if _branch() == 'master':
                 self.__update_itchio()
                 cmds += [('timeout 720s /home/flavio/.config/itch/apps/pmachines/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt')]
-            cmds += [('timeout 720s flatpak run it.ya2.Pmachines//%s --version' % bld_branch, '/home/flavio/.var/app/it.ya2.Pmachines/data/pmachines/obs_version.txt')]
-        info('executing flatpak update --user -y it.ya2.Pmachines//%s' % bld_branch)
-        #system('flatpak update -y --user it.ya2.Pmachines//%s' % bld_branch)
-        fout = exec_cmd('flatpak update -y --user it.ya2.Pmachines//%s' % bld_branch)
-        info('executed flatpak update --user -y it.ya2.Pmachines//%s' % bld_branch)
-        info(fout)
+            # cmds += [('timeout 720s flatpak run it.ya2.Pmachines//%s --version' % bld_branch, '/home/flavio/.var/app/it.ya2.Pmachines/data/pmachines/obs_version.txt')]
+        # info('executing flatpak update --user -y it.ya2.Pmachines//%s' % bld_branch)
+        # #system('flatpak update -y --user it.ya2.Pmachines//%s' % bld_branch)
+        # fout = exec_cmd('flatpak update -y --user it.ya2.Pmachines//%s' % bld_branch)
+        # info('executed flatpak update --user -y it.ya2.Pmachines//%s' % bld_branch)
+        # info(fout)
         for cmd in cmds:
             if exists(cmd[1]):
                 remove(cmd[1])