Merge lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion into lp:ubuntu-filemanager-app

Proposed by Nicholas Skaggs on 2014-05-06
Status: Rejected
Rejected by: Nicholas Skaggs on 2014-05-06
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion
Merge into: lp:ubuntu-filemanager-app
Diff against target: 122 lines (+9/-16)
5 files modified
debian/control (+4/-3)
tests/autopilot/CMakeLists.txt (+1/-1)
tests/autopilot/filemanager/emulators.py (+3/-9)
tests/autopilot/filemanager/tests/__init__.py (+1/-1)
tests/autopilot/filemanager/tests/test_filemanager.py (+0/-2)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration 2014-05-06 Approve on 2014-05-06
David Planella Needs Fixing on 2014-05-06
Review via email: mp+218478@code.launchpad.net

Commit message

py3 ap conversion

Description of the change

DO NOT MERGE, jenkins test

To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote :

Same error, hmmm.

CMake Error at tests/autopilot/CMakeLists.txt:5 (install):
  install DIRECTORY given no DESTINATION!

172. By Nicholas Skaggs on 2014-05-06

revert everything, trunk build

173. By Nicholas Skaggs on 2014-05-06

add back py3 changes, revert cmakelists

Nicholas Skaggs (nskaggs) wrote :

So trunk builds fine.. Iterating changes.

174. By Nicholas Skaggs on 2014-05-06

hardcode ap dir, resume using py3 in cmakelists

David Planella (dpm) wrote :

48 -install(DIRECTORY ${AUTOPILOT_DIR}
49 +install(DIRECTORY filemanager

Why the hardcoding? AUTOPILOT_DIR seems to already be correctly defined in the top CMakeLists.txt file

review: Needs Fixing
175. By Nicholas Skaggs on 2014-05-06

removed hardcoding, use python3 as depends

Nicholas Skaggs (nskaggs) wrote :

dpm, not sure why you are seeing this MP as I'm just playing with jenkins and trying to figure out why it's not building properly. I've left it as work in progress; it shouldn't be showing anywhere?

David Planella (dpm) wrote :

No worries, I'm subscribed to all core apps MPs, so I see everything
(mwahaha :)

On Tue, May 6, 2014 at 8:27 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> dpm, not sure why you are seeing this MP as I'm just playing with jenkins
> and trying to figure out why it's not building properly. I've left it as
> work in progress; it shouldn't be showing anywhere?
> --
>
> https://code.launchpad.net/~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion/+merge/218478
> You are reviewing the proposed merge of
> lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion into
> lp:ubuntu-filemanager-app.
>

Unmerged revisions

175. By Nicholas Skaggs on 2014-05-06

removed hardcoding, use python3 as depends

174. By Nicholas Skaggs on 2014-05-06

hardcode ap dir, resume using py3 in cmakelists

173. By Nicholas Skaggs on 2014-05-06

add back py3 changes, revert cmakelists

172. By Nicholas Skaggs on 2014-05-06

revert everything, trunk build

171. By Nicholas Skaggs on 2014-05-06

add depends

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-04-29 13:27:25 +0000
3+++ debian/control 2014-05-06 18:22:40 +0000
4@@ -3,12 +3,13 @@
5 Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
6 Build-Depends: cmake,
7 debhelper (>= 9),
8- python,
9 qtbase5-dev,
10 qtdeclarative5-dev,
11 qt5-default,
12 pkg-kde-tools,
13 libtag1-dev,
14+ python3,
15+ gettext,
16 Standards-Version: 3.9.5
17 Section: misc
18 Homepage: https://launchpad.net/ubuntu-filemanager-app
19@@ -38,7 +39,7 @@
20 Qt is a cross-platform C++ application framework. Qt's primary feature
21 is its rich set of widgets that provide standard GUI functionality.
22 .
23- This package contains the Folder List model plugin of the Nemo QML
24+ This package contains the Folder List model plugin of the Nemo QML
25 plugins collection.
26
27 Package: ubuntu-filemanager-app-autopilot
28@@ -46,8 +47,8 @@
29 Depends: ${misc:Depends},
30 libautopilot-qt (>= 1.4),
31 libqt5test5,
32- python-mock,
33 ubuntu-filemanager-app (>= ${source:Version}),
34 ubuntu-ui-toolkit-autopilot,
35+ python3-autopilot,
36 Description: Autopilot tests for File Manager Application
37 This package contains the autopilot tests for the File Manager
38
39=== modified file 'tests/autopilot/CMakeLists.txt'
40--- tests/autopilot/CMakeLists.txt 2014-01-31 20:03:12 +0000
41+++ tests/autopilot/CMakeLists.txt 2014-05-06 18:22:40 +0000
42@@ -1,5 +1,5 @@
43 if(INSTALL_TESTS)
44-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
45+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
46 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
47
48 install(DIRECTORY ${AUTOPILOT_DIR}
49
50=== modified file 'tests/autopilot/filemanager/emulators.py'
51--- tests/autopilot/filemanager/emulators.py 2014-04-14 18:41:13 +0000
52+++ tests/autopilot/filemanager/emulators.py 2014-05-06 18:22:40 +0000
53@@ -54,7 +54,7 @@
54
55 def get_places_popover(self):
56 """Return the Places popover."""
57- if not(self.internal_wideAspect):
58+ if not self.internal_wideAspect:
59 # XXX It would be easier if the places popover was an object
60 # that inherits from Popover, like the
61 # ActionSelectionPopover does.
62@@ -147,7 +147,7 @@
63
64 """
65 files = self.select_many(FolderListDelegate)
66- if not(self.showingListView):
67+ if not self.showingListView:
68 files = self.select_many(FolderIconDelegate)
69 for file_ in files:
70 if file_.fileName == name:
71@@ -305,7 +305,7 @@
72 # autopilot. Reported on
73 # bug https://bugs.launchpad.net/autopilot/+bug/1195141
74 # --elopio - 2013-07-25
75- raise NotImplementedError()
76+ raise NotImplementedError
77
78 def open_actions_popover(self):
79 """Open the actions popover of the file or folder."""
80@@ -417,16 +417,10 @@
81 class Dialog(ConfirmDialogWithInput):
82 """Dialog Autopilot emulator."""
83
84- def __init__(self, *args):
85- super(Dialog, self).__init__(*args)
86-
87
88 class Popover(ConfirmDialogWithInput):
89 """Popover Autopilot emulator, containing buttons and an inputfield"""
90
91- def __init__(self, *args):
92- super(Popover, self).__init__(*args)
93-
94 def click_button(self, text):
95 """Click a button on the popover.
96
97
98=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
99--- tests/autopilot/filemanager/tests/__init__.py 2014-04-28 21:06:30 +0000
100+++ tests/autopilot/filemanager/tests/__init__.py 2014-05-06 18:22:40 +0000
101@@ -7,7 +7,7 @@
102
103 """Filemanager app autopilot tests."""
104
105-import os.path
106+import os
107 import shutil
108 import tempfile
109 import logging
110
111=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
112--- tests/autopilot/filemanager/tests/test_filemanager.py 2014-04-26 06:35:52 +0000
113+++ tests/autopilot/filemanager/tests/test_filemanager.py 2014-05-06 18:22:40 +0000
114@@ -16,8 +16,6 @@
115
116 """File Manager app autopilot tests."""
117
118-from __future__ import absolute_import
119-
120 import tempfile
121 import unittest
122 import logging

Subscribers

People subscribed via source and target branches