Merge lp:~ahayzen/ubuntu-weather-app/autopilot-move-py3 into lp:ubuntu-weather-app/obsolete.trunk

[Andrew Hayzen]

* Use python3 for autopilot in all cases

This allows jenkins to use python 3 as well as devices.

* Use python3 for autopilot in all cases

This allows jenkins to use python 3 as well as devices.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:361
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/263/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/96/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/69

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/263/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

trial run http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/266

[Nicholas Skaggs (nskaggs)]

Looks like a trunk test failure, so this is probably good. Doing a second run:

http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/268

[Nicholas Skaggs (nskaggs)]

Still trunk fails:

http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/348/

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:361
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/268/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app-python3/4
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app-python3/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/74

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/268/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-06-07 00:00:36 +0000
+++ debian/control	2014-09-08 20:45:31 +0000
@@ -4,7 +4,7 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                intltool,
-               python,
+               python3,
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-weather-app
@@ -27,7 +27,6 @@
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
          libqt5widgets5,
-         python2.7,
          ubuntu-ui-toolkit-autopilot,
          ubuntu-weather-app (= ${source:Version}),
          ${misc:Depends},

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2014-01-31 21:06:15 +0000
+++ tests/autopilot/CMakeLists.txt	2014-09-08 20:45:31 +0000
@@ -1,5 +1,5 @@
 if(INSTALL_TESTS)
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install(DIRECTORY ${AUTOPILOT_DIR}