Merge lp:~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3 into lp:~dpm/ubuntu-terminal-app/merge-plugin

Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: David Planella
Proposed branch: lp:~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3
Merge into: lp:~dpm/ubuntu-terminal-app/merge-plugin
Diff against target: 59 lines (+4/-10)
4 files modified
README.md (+0/-6)
debian/control (+2/-2)
tests/autopilot/CMakeLists.txt (+1/-1)
tests/autopilot/ubuntu_terminal_app/CMakePluginParser.py (+1/-1)
To merge this branch: bzr merge lp:~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3
Reviewer Review Type Date Requested Status
David Planella Disapprove
Nicholas Skaggs Pending
Review via email: mp+218483@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

install autopilot tests into python3 path.

73. By Dimitri John Ledkov on 2014-05-06

Add python3 build-dep.

Revision history for this message
David Planella (dpm) wrote :

Rejected as part of cleaning up MPs for Terminal. We discussed the changes on this branch a while ago (I can't find the comments, though), and the issue is that replacing the Python import without replacing the code that processes the XML won't work.

review: Disapprove
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Apart from "didn't work" comment no other comments were provided neither at
the time, not now. Fully works here for me. What's wrong?
On 12 Aug 2014 15:41, "David Planella" <email address hidden> wrote:

> Review: Disapprove
>
> Rejected as part of cleaning up MPs for Terminal. We discussed the changes
> on this branch a while ago (I can't find the comments, though), and the
> issue is that replacing the Python import without replacing the code that
> processes the XML won't work.
> --
>
> https://code.launchpad.net/~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3/+merge/218483
> You are the owner of lp:~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3.
>

Unmerged revisions

73. By Dimitri John Ledkov on 2014-05-06

Add python3 build-dep.

72. By Dimitri John Ledkov on 2014-05-06

Install autopilot tests into python3 path.

71. By Dimitri John Ledkov on 2014-05-06

Drop lxml dependency

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2014-05-06 15:07:24 +0000
3+++ README.md 2014-05-06 18:32:06 +0000
4@@ -150,9 +150,3 @@
5
6 cd tests/autopilot
7 autopilot run ubuntu_terminal_app
8-
9-To run the tests on a device, the python3-lxml lib needs to be manually copied
10-to /home/phablet/autopilot. Note that the armhf version is required, as it's a
11-compiled module. This manual step is only temporary until the
12-phablet-click-test-setup gains the capability of automatically doing this
13-setup.
14
15=== modified file 'debian/control'
16--- debian/control 2014-05-06 15:07:24 +0000
17+++ debian/control 2014-05-06 18:32:06 +0000
18@@ -3,7 +3,7 @@
19 Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
20 Build-Depends: cmake,
21 debhelper (>= 9),
22- python,
23+ python3,
24 gettext,
25 qtbase5-dev,
26 qtdeclarative5-dev,
27@@ -45,7 +45,7 @@
28 Depends: ${misc:Depends},
29 libautopilot-qt,
30 libqt5test5,
31- python3-lxml,
32+ python3-autopilot,
33 ubuntu-terminal-app (>= ${source:Version}),
34 ubuntu-ui-toolkit-autopilot,
35 Description: Autopilot tests for Terminal Application
36
37=== modified file 'tests/autopilot/CMakeLists.txt'
38--- tests/autopilot/CMakeLists.txt 2014-02-04 16:10:39 +0000
39+++ tests/autopilot/CMakeLists.txt 2014-05-06 18:32:06 +0000
40@@ -1,5 +1,5 @@
41 if(INSTALL_TESTS)
42-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
43+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
44 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
45
46 install(DIRECTORY ${AUTOPILOT_DIR}
47
48=== modified file 'tests/autopilot/ubuntu_terminal_app/CMakePluginParser.py'
49--- tests/autopilot/ubuntu_terminal_app/CMakePluginParser.py 2014-04-28 06:06:48 +0000
50+++ tests/autopilot/ubuntu_terminal_app/CMakePluginParser.py 2014-05-06 18:32:06 +0000
51@@ -23,7 +23,7 @@
52 """
53
54 import sys
55-from lxml import etree
56+import xml.etree.ElementTree as etree
57
58
59 class CMakePluginParseError(Exception):

Subscribers

People subscribed via source and target branches