Merge lp:~veebers/trv/snapping-trv into lp:trv

[Christopher Lee]

Snapping trv.

Snapping trv.

Unmerged revisions

28. By Christopher Lee on 2016-08-28

Remove un-needed rules as it's handled in setup.py now.

27. By Christopher Lee on 2016-08-28

Add newline

26. By Christopher Lee on 2016-08-28

Snapped. Update setup.py to do resource gen.

=== modified file 'debian/rules'
--- debian/rules	2014-12-08 02:09:32 +0000
+++ debian/rules	2016-08-28 23:39:24 +0000
@@ -6,8 +6,3 @@
 # main packaging script based on dh7 syntax
 %:
 	dh $@ --with python3 --buildsystem pybuild
-
-override_dh_auto_build:
-	./regen_resources.sh
-	dh_auto_build
-

=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2016-08-28 23:39:24 +0000
@@ -0,0 +1,2 @@
+testtools
+python-subunit

=== modified file 'setup.py'
--- setup.py	2014-12-05 03:06:30 +0000
+++ setup.py	2016-08-28 23:39:24 +0000
@@ -21,7 +21,14 @@
 import sys
 assert sys.version_info >= (3,), 'Python 3 is required'
 
-from setuptools import find_packages, setup
+
+from distutils.cmd import Command
+from setuptools import (
+    find_packages,
+    setup,
+)
+from setuptools.command.build_py import build_py
+import subprocess
 from trv import __version__
 
 
@@ -30,6 +37,29 @@
 ]
 
 
+class ResourceCommand(Command):
+    """Custom command for running the resource creation."""
+
+    description = 'run pyrcc5 command to create the resources.'
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        self.announce('Running command: {}'.format('regen_resouces.sh'))
+        subprocess.check_call(['./regen_resources.sh'])
+
+
+class BuildResourcesCommand(build_py):
+    """Run the pyrcc5 command for resources."""
+
+    def run(self):
+        self.run_command('resource')
+        super().run()
+
 setup(
     name='trv',
     version=__version__,
@@ -45,6 +75,10 @@
     entry_points={
         'console_scripts': ['trv = trv:main']
     },
+    cmdclass={
+        'resource': ResourceCommand,
+        'build_py': BuildResourcesCommand,
+    },
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: MacOS X',

=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-08-28 23:39:24 +0000
@@ -0,0 +1,23 @@
+name: trv
+version: "1.1.0"
+summary: A graphical test result viewer
+description: |
+  TRV (Test Result Viewer) is a simple graphical tool to inspect the contents
+  of binary subunit test result streams.
+confinement: strict
+
+apps:
+  trv:
+    command: desktop-launch trv
+    plugs:
+      - x11
+
+parts:
+  trv:
+    stage-packages:
+      - python3-pyqt5
+    plugin: python3
+    requirements: "./requirements.txt"
+
+    source: ./
+    after: [ desktop/qt5 ]