Merge lp:~xnox/stock-ticker-mobile-app/python3 into lp:stock-ticker-mobile-app

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 71
Proposed branch: lp:~xnox/stock-ticker-mobile-app/python3
Merge into: lp:stock-ticker-mobile-app
Diff against target: 79 lines (+17/-6)
6 files modified
debian/changelog (+6/-0)
debian/compat (+1/-1)
debian/control (+4/-2)
debian/rules (+1/-1)
debian/stock-ticker-mobile-app-autopilot.install (+1/-1)
manifest.json (+4/-1)
To merge this branch: bzr merge lp:~xnox/stock-ticker-mobile-app/python3
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Stock Ticker Developers Pending
Review via email: mp+215159@code.launchpad.net

Commit message

Mark autopilot tests as python3 compatible.

Description of the change

Mark autopilot tests as python3 compatible.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-24 17:12:21 +0000
3+++ debian/changelog 2014-04-10 12:06:28 +0000
4@@ -1,3 +1,9 @@
5+stock-ticker-mobile-app (0.3.9) trusty; urgency=medium
6+
7+ * Mark autopilot tests as python3 compatible.
8+
9+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 10 Apr 2014 13:04:06 +0100
10+
11 stock-ticker-mobile-app (0.3.8) raring; urgency=medium
12
13 * Bump changelog to fix ppa building
14
15=== modified file 'debian/compat'
16--- debian/compat 2013-06-01 13:22:40 +0000
17+++ debian/compat 2014-04-10 12:06:28 +0000
18@@ -1,1 +1,1 @@
19-8
20+9
21
22=== modified file 'debian/control'
23--- debian/control 2013-10-09 15:56:07 +0000
24+++ debian/control 2014-04-10 12:06:28 +0000
25@@ -2,8 +2,9 @@
26 Section: misc
27 Priority: extra
28 Maintainer: Robert Steckroth, surgemcgee <RobertSteckroth@gmail.com>
29-Build-Depends: debhelper (>= 9)
30+Build-Depends: debhelper (>= 9), python3, dh-python
31 Standards-Version: 3.9.4
32+X-Python3-Version: >= 3.2
33 Homepage: https://launchpad.net/stock-ticker-mobile-app
34 Vcs-Bzr: https://code.launchpad.net/stock-ticker-mobile-app
35 Vcs-Browser: https://launchpad.net/stock-ticker-mobile-app;a=summary
36@@ -26,7 +27,8 @@
37 Depends: libautopilot-qt,
38 libqt5test5,
39 stock-ticker-mobile-app (= ${source:Version}),
40- python-dateutil,
41+ python3-autopilot,
42+ ${python3:Depends},
43 ubuntu-ui-toolkit-autopilot,
44 Description: Autopilot tests for stock ticker Application
45 This package contains autopilot tests for the stock ticker application.
46
47=== modified file 'debian/rules'
48--- debian/rules 2013-06-13 20:26:45 +0000
49+++ debian/rules 2014-04-10 12:06:28 +0000
50@@ -10,7 +10,7 @@
51 #export DH_VERBOSE=1
52
53 %:
54- dh $@
55+ dh $@ --with python3
56
57 override_dh_install:
58 dh_install --fail-missing
59
60=== modified file 'debian/stock-ticker-mobile-app-autopilot.install'
61--- debian/stock-ticker-mobile-app-autopilot.install 2013-10-09 19:09:18 +0000
62+++ debian/stock-ticker-mobile-app-autopilot.install 2014-04-10 12:06:28 +0000
63@@ -1,1 +1,1 @@
64-tests/autopilot/stock_ticker/* usr/lib/python2.7/dist-packages/stock_ticker/
65+tests/autopilot/stock_ticker usr/lib/python3/dist-packages/
66
67=== modified file 'manifest.json'
68--- manifest.json 2013-10-09 20:04:19 +0000
69+++ manifest.json 2014-04-10 12:06:28 +0000
70@@ -11,5 +11,8 @@
71 "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
72 "name": "com.ubuntu.stock-ticker-mobile",
73 "title": "stock-ticker-mobile",
74- "version": "0.3.7"
75+ "version": "0.3.7",
76+ "x-test": {
77+ "autopilot": "stock_ticker"
78+ }
79 }

Subscribers

People subscribed via source and target branches