Merge lp:~ahayzen/ubuntu-calculator-app/autopilot-move-py3 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Andrew Hayzen]

* Use python3 for autopilot in all cases

* 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:323
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/253/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1946/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/48/console

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/ubuntu-calculator-app/autopilot-move-py3]

324. By Andrew Hayzen on 2014-09-08

* Fix for missing py3 conversions

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

FAILED: Continuous integration, rev:324
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/254/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1948/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/49/console

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/ubuntu-calculator-app/autopilot-move-py3]

325. By Andrew Hayzen on 2014-09-08

* Fix for tabbing issue

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

FAILED: Continuous integration, rev:325
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/255/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1949/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1949/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/50

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

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

[lp:~ahayzen/ubuntu-calculator-app/autopilot-move-py3]

326. By Andrew Hayzen on 2014-09-09

* Merge of trunk

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

FAILED: Continuous integration, rev:326
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/260/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1962/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1962/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/55

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

run #2 http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/267/

[Nicholas Skaggs (nskaggs)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-05-16 20:21:54 +0000
+++ debian/control	2014-09-09 13:34:01 +0000
@@ -5,7 +5,7 @@
                cmake,
                gettext,
                intltool,
-               python:any (>= 2.7),
+               python3:any,
 Standards-Version: 3.9.5
 Section: misc
 Homepage: https://launchpad.net/ubuntu-calculator-app

=== modified file 'debian/rules'
--- debian/rules	2014-09-08 10:12:57 +0000
+++ debian/rules	2014-09-09 13:34:01 +0000
@@ -7,7 +7,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --parallel --fail-missing --with python2
+	dh $@ --parallel --fail-missing --with python3
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCLICK_MODE=OFF

=== modified file 'images/generate.py'
--- images/generate.py	2013-08-09 18:37:04 +0000
+++ images/generate.py	2014-09-09 13:34:01 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import subprocess
 import os

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2014-01-17 20:50:29 +0000
+++ tests/autopilot/CMakeLists.txt	2014-09-09 13:34:01 +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}