Merge lp:~mardy/uoa-integration-tests/python3 into lp:uoa-integration-tests

[Alberto Mardegan]

Use python3

Use python3

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-trusty-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-trusty-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uoa-integration-tests-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/uoa-integration-tests/python3]

14. By Alberto Mardegan on 2014-05-05

Remove unused distutils.extra dependency

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:14
http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uoa-integration-tests-ci/6/rebuild

review: Approve (continuous-integration)

[lp:~mardy/uoa-integration-tests/python3]

15. By Alberto Mardegan on 2014-05-06

Use pyBuild

Following https://wiki.debian.org/Python/Pybuild

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/uoa-integration-tests-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uoa-integration-tests-ci/7/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 16:36:26 +0000
+++ debian/changelog	2014-05-06 12:37:25 +0000
@@ -1,3 +1,9 @@
+uoa-integration-tests (0.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Use python3.
+
+ -- Alberto Mardegan <[e-mail]>  Mon, 05 May 2014 16:34:50 +0300
+
 uoa-integration-tests (0.1+13.10.20131003.1-0ubuntu1) saucy; urgency=low
 
   [ Alberto Mardegan ]

=== modified file 'debian/control'
--- debian/control	2013-05-03 19:44:04 +0000
+++ debian/control	2014-05-06 12:37:25 +0000
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Ken VanDine <[e-mail]>
 Build-Depends: debhelper (>= 9.0.0),
-               python,
-               python-distutils-extra,
+               dh-python,
+               python3-all,
+               python3-setuptools,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/uoa-integration-tests
 # If you aren't a member of ~online-accounts but need to upload packaging changes,

=== modified file 'debian/rules'
--- debian/rules	2013-05-07 14:02:05 +0000
+++ debian/rules	2014-05-06 12:37:25 +0000
@@ -9,4 +9,4 @@
 	dh_install --fail-missing
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3 --buildsystem=pybuild

=== modified file 'setup.py'
--- setup.py	2013-10-25 09:09:31 +0000
+++ setup.py	2014-05-06 12:37:25 +0000
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 #
 from distutils.core import setup
-from DistUtilsExtra.command import build_extra
 
 setup(name="uoa-integration-tests",
-      version="0.1",
+      version="0.2",
       author="Alberto Mardegan",
       author_email="[e-mail]",
       url="http://launchpad.net/uoa-integration-tests",
@@ -28,4 +27,4 @@
     ('share/accounts/applications', ['data/uoa-integration-tests.application']),
     ('/etc/ssl/certs', ['data/uoa-test-server.pem']),
     ('/etc/signon-ui/webkit-options.d', ['data/localhost.conf']),
-    ], cmdclass={"build": build_extra.build_extra,})
+    ])