Merge lp:~javier.collado/utah/bug1034902 into lp:utah

[Javier Collado]

pip related code and pre-dependency has been removed
python-jsonschema has been added as a dependency

python-jsonschema package has been made available for precise in the "UTAH Stable Builds" PPA.
The same quantal packaging has been reused, so the behaviour should be exactly the same as in quantal.

[lp:~javier.collado/utah/bug1034902]

615. By Javier Collado on 2012-08-09

Fixed README to install jsonschema as a package

[Joe Talbott (joetalbott)]

Thanks for getting this sorted out.

review: Approve

=== modified file 'debian/control'
--- debian/control	2012-08-02 21:03:04 +0000
+++ debian/control	2012-08-09 14:07:25 +0000
@@ -10,11 +10,10 @@
 
 Package: utah
 Architecture: all
-Pre-Depends: python-pip
 Depends: ${misc:Depends}, ${python:Depends},
          bzr, bsdtar, git, libvirt-bin, lzma,
-         python-apt, python-libvirt, python-netifaces, python-paramiko,
-         python-psutil, python-yaml
+         python-apt, python-libvirt, python-jsonschema,
+         python-netifaces, python-paramiko, python-psutil, python-yaml
 Recommends: kvm, vm-tools
 Provides: utah-client, ubuntu-automation-test-harness, ubuntu-automation-test-harness-client
 Conflicts: utah-client, ubuntu-automation-test-harness, ubuntu-automation-test-harness-client
@@ -23,7 +22,6 @@
 
 Package: utah-client
 Architecture: all
-Pre-Depends: python-pip
-Depends: ${misc:Depends}, ${python:Depends}, python-yaml, bzr, git
+Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema, python-yaml, bzr, git
 Description: Ubuntu Test Automation Harness Client
  Automation framework for testing in Ubuntu, client portion

=== removed file 'debian/utah-client.postrm'
--- debian/utah-client.postrm	2012-08-08 15:15:21 +0000
+++ debian/utah-client.postrm	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-case "$1" in
-    remove|purge|abort-install)
-        if ! dpkg -s python-jsonschema &> /dev/null \
-           && python -c "import jsonschema" &> /dev/null; then
-            echo 'Uninstalling jsonschema...'
-            pip uninstall -y jsonschema
-        fi
-        ;;
-    upgrade|failed-upgrade|abort-upgrade)
-        ;;
-    *)
-        echo "$0: didn't understand being called with '$1'" 1>&2
-        exit 0
-        ;;
-esac
-
-#DEBHELPER#

=== removed file 'debian/utah-client.preinst'
--- debian/utah-client.preinst	2012-08-08 15:15:21 +0000
+++ debian/utah-client.preinst	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-case "$1" in
-    install|upgrade)
-        if ! python -c "import jsonschema" &> /dev/null; then
-            echo "Installing jsonschema..."
-            pip install jsonschema
-        fi
-        ;;
-    abort-upgrade)
-        if ! dpkg -s python-jsonschema &> /dev/null \
-           && python -c "import jsonschema" &> /dev/null; then
-            echo 'Uninstalling jsonschema...'
-            pip uninstall -y jsonschema
-        fi
-        ;;
-    *)
-        echo "$0: didn't understand being called with '$1'" 1>&2
-        exit 0
-        ;;
-esac
-
-#DEBHELPER#

=== modified file 'debian/utah.postrm'
--- debian/utah.postrm	2012-08-02 20:58:48 +0000
+++ debian/utah.postrm	2012-08-09 14:07:25 +0000
@@ -21,12 +21,6 @@
         fi
 
         dnsteardown
-
-        if ! dpkg -s python-jsonschema &> /dev/null \
-           && python -c "import jsonschema" &> /dev/null; then
-            echo 'Uninstalling jsonschema...'
-            pip uninstall -y jsonschema
-        fi
         ;;
     upgrade|failed-upgrade|abort-upgrade)
         ;;

=== removed file 'debian/utah.preinst'
--- debian/utah.preinst	2012-08-08 15:15:21 +0000
+++ debian/utah.preinst	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-case "$1" in
-    install|upgrade)
-        if ! python -c "import jsonschema" &> /dev/null; then
-            echo "Installing jsonschema..."
-            pip install jsonschema
-        fi
-        ;;
-    abort-upgrade)
-        if ! dpkg -s python-jsonschema &> /dev/null \
-           && python -c "import jsonschema" &> /dev/null; then
-            echo 'Uninstalling jsonschema...'
-            pip uninstall -y jsonschema
-        fi
-        ;;
-    *)
-        echo "$0: didn't understand being called with '$1'" 1>&2
-        exit 0
-        ;;
-esac
-
-#DEBHELPER#

=== modified file 'utah/client/tests/README'
--- utah/client/tests/README	2012-08-07 19:26:12 +0000
+++ utah/client/tests/README	2012-08-09 14:07:25 +0000
@@ -3,7 +3,7 @@
 Files in this diretory are run via 'nosetests' and should be written and
 named accordingly.  See nosetests(?) for the default testMatch pattern.
 
-Don't rename/name manually run (read: not automatically collected by 
+Don't rename/name manually run (read: not automatically collected by
 nosetests) such that they match the pattern.
 
 These tests should be written so that they can be run on a checked-out
@@ -12,8 +12,7 @@
 To run the tests.
 
   # install required packages
-  sudo apt-get install python-yaml  python-nose  python-pip  rsync
-  sudo pip install jsonschema
+  sudo apt-get install python-yaml python-jsonschema python-nose python-pip rsync
 
   cd ~/bzr/utah-dev
   sudo nosetests utah/client/tests