Merge lp:~canonical-platform-qa/utah/remove-custom-deb into lp:utah

[Max Brustkern]

Remove local python-jsonschema deb since the archive one is good enough.

python-jsonschema has been at 1.3 or higher in the archive for years now. Trusty and later don't require the local deb, and precise will be exiting support shortly, so let's remove that.

[Joshua Powers (powersj)]

LGTM - thanks!

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-05-23 12:31:08 +0000
+++ Makefile	2017-03-03 15:02:28 +0000
@@ -1,8 +1,5 @@
 PYC_PATTERN?=*.pyc
-all: python-jsonschema html-docs client conf/utah/bootspeed-preseed.cfg conf/utah/bridged-network-vm.xml conf/utah/config manpages
-
-python-jsonschema:
-	apt-get download python-jsonschema
+all: html-docs client conf/utah/bootspeed-preseed.cfg conf/utah/bridged-network-vm.xml conf/utah/config manpages
 
 client:
 	[ -d "client" ] || mkdir client
@@ -36,7 +33,6 @@
 	rm -f utah_*.build
 	rm -f utah_*.changes
 	rm -f utah-*_all.deb
-	rm -f python-jsonschema*.deb
 	cd docs && make clean
 
-.PHONY: python-jsonschema client clean manpages
+.PHONY: client clean manpages

=== modified file 'debian/utah.install'
--- debian/utah.install	2017-02-21 20:46:20 +0000
+++ debian/utah.install	2017-03-03 15:02:28 +0000
@@ -4,6 +4,5 @@
 utah/isotest usr/share/utah
 utah-client_*_all.deb usr/share/utah
 utah-common_*_all.deb usr/share/utah
-python-jsonschema_*_all.deb usr/share/utah
 templates usr/share/utah
 utah/yaml2xunit.py usr/bin

=== modified file 'tests/test_debs.py'
--- tests/test_debs.py	2013-05-24 14:29:23 +0000
+++ tests/test_debs.py	2017-03-03 15:02:28 +0000
@@ -58,28 +58,6 @@
         config.packagedir = self.pkgdir
         shutil.rmtree(self.tmpdir)
 
-    def _setup_schema(self, oldest, latest):
-        pkgfmt = 'python-jsonschema_0.{}-0~ppa1_all.deb'
-
-        for x in xrange(oldest, latest + 1):
-            fname = pkgfmt.format(x)
-            with open(os.path.join(self.tmpdir, fname), 'w') as f:
-                f.write('')
-        return pkgfmt.format(latest)
-
-    def test_missing_schema(self):
-        """Ensure exception is raised when missing schema deb."""
-        self.assertRaises(UTAHProvisioningException, _schema_deb)
-
-    def test_schema_deb(self):
-        """Check that we return the latest schema deb."""
-
-        latest = self._setup_schema(1, 3)
-
-        #ensure we got the latest version of the schema
-        deb = _schema_deb()
-        self.assertEqual(latest, os.path.basename(deb))
-
     @patch('apt.cache.Cache')
     def test_client_debs(self, cache):
         """Ensure get_client_debs API works."""

=== modified file 'utah/provisioning/debs.py'
--- utah/provisioning/debs.py	2013-11-11 18:35:53 +0000
+++ utah/provisioning/debs.py	2017-03-03 15:02:28 +0000
@@ -18,8 +18,6 @@
 import apt.cache
 import os
 
-from glob import glob
-
 from utah.config import config
 from utah.provisioning.exceptions import UTAHProvisioningException
 
@@ -37,17 +35,6 @@
     return path
 
 
-def _schema_deb():
-    debpath = config.packagedir
-    deb_file_glob = os.path.join(debpath, 'python-jsonschema_*_all.deb')
-    deb_files = glob(deb_file_glob)
-    if not deb_files:
-        msg = 'python-jsonschema package file not found in {}'.format(debpath)
-        raise UTAHProvisioningException(msg)
-    deb_files.sort()
-    return deb_files[-1]
-
-
 def get_client_debs():
     """Return paths to all .debs required to install the utah-client.
 
@@ -56,4 +43,4 @@
     :raises UTAHProvisioningException: When package(s) can't be found
 
     """
-    return [_schema_deb(), _utah_deb('common'), _utah_deb('client')]
+    return [_utah_deb('common'), _utah_deb('client')]

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2013-09-10 16:16:09 +0000
+++ utah/provisioning/provisioning.py	2017-03-03 15:02:28 +0000
@@ -301,7 +301,7 @@
     def installclient(self):
         """Install the required packages on the machine.
 
-        Install the python-jsonschema, utah-common, and utah-client packages.
+        Install the utah-common and utah-client packages.
 
         :raises UTAHProvisioningException: When packages won't install