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
=== modified file 'debian/control'
--- debian/control 2014-04-29 13:27:25 +0000
+++ debian/control 2014-05-06 18:22:40 +0000
@@ -3,12 +3,13 @@
3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
4Build-Depends: cmake,4Build-Depends: cmake,
5 debhelper (>= 9),5 debhelper (>= 9),
6 python,
7 qtbase5-dev,6 qtbase5-dev,
8 qtdeclarative5-dev,7 qtdeclarative5-dev,
9 qt5-default,8 qt5-default,
10 pkg-kde-tools,9 pkg-kde-tools,
11 libtag1-dev,10 libtag1-dev,
11 python3,
12 gettext,
12Standards-Version: 3.9.513Standards-Version: 3.9.5
13Section: misc14Section: misc
14Homepage: https://launchpad.net/ubuntu-filemanager-app15Homepage: https://launchpad.net/ubuntu-filemanager-app
@@ -38,7 +39,7 @@
38 Qt is a cross-platform C++ application framework. Qt's primary feature39 Qt is a cross-platform C++ application framework. Qt's primary feature
39 is its rich set of widgets that provide standard GUI functionality.40 is its rich set of widgets that provide standard GUI functionality.
40 .41 .
41 This package contains the Folder List model plugin of the Nemo QML 42 This package contains the Folder List model plugin of the Nemo QML
42 plugins collection.43 plugins collection.
4344
44Package: ubuntu-filemanager-app-autopilot45Package: ubuntu-filemanager-app-autopilot
@@ -46,8 +47,8 @@
46Depends: ${misc:Depends},47Depends: ${misc:Depends},
47 libautopilot-qt (>= 1.4),48 libautopilot-qt (>= 1.4),
48 libqt5test5,49 libqt5test5,
49 python-mock,
50 ubuntu-filemanager-app (>= ${source:Version}),50 ubuntu-filemanager-app (>= ${source:Version}),
51 ubuntu-ui-toolkit-autopilot,51 ubuntu-ui-toolkit-autopilot,
52 python3-autopilot,
52Description: Autopilot tests for File Manager Application53Description: Autopilot tests for File Manager Application
53 This package contains the autopilot tests for the File Manager54 This package contains the autopilot tests for the File Manager
5455
=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt 2014-01-31 20:03:12 +0000
+++ tests/autopilot/CMakeLists.txt 2014-05-06 18:22:40 +0000
@@ -1,5 +1,5 @@
1if(INSTALL_TESTS)1if(INSTALL_TESTS)
2execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"2execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
3 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)3 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
44
5install(DIRECTORY ${AUTOPILOT_DIR}5install(DIRECTORY ${AUTOPILOT_DIR}
66
=== modified file 'tests/autopilot/filemanager/emulators.py'
--- tests/autopilot/filemanager/emulators.py 2014-04-14 18:41:13 +0000
+++ tests/autopilot/filemanager/emulators.py 2014-05-06 18:22:40 +0000
@@ -54,7 +54,7 @@
5454
55 def get_places_popover(self):55 def get_places_popover(self):
56 """Return the Places popover."""56 """Return the Places popover."""
57 if not(self.internal_wideAspect):57 if not self.internal_wideAspect:
58 # XXX It would be easier if the places popover was an object58 # XXX It would be easier if the places popover was an object
59 # that inherits from Popover, like the59 # that inherits from Popover, like the
60 # ActionSelectionPopover does.60 # ActionSelectionPopover does.
@@ -147,7 +147,7 @@
147147
148 """148 """
149 files = self.select_many(FolderListDelegate)149 files = self.select_many(FolderListDelegate)
150 if not(self.showingListView):150 if not self.showingListView:
151 files = self.select_many(FolderIconDelegate)151 files = self.select_many(FolderIconDelegate)
152 for file_ in files:152 for file_ in files:
153 if file_.fileName == name:153 if file_.fileName == name:
@@ -305,7 +305,7 @@
305 # autopilot. Reported on305 # autopilot. Reported on
306 # bug https://bugs.launchpad.net/autopilot/+bug/1195141306 # bug https://bugs.launchpad.net/autopilot/+bug/1195141
307 # --elopio - 2013-07-25307 # --elopio - 2013-07-25
308 raise NotImplementedError()308 raise NotImplementedError
309309
310 def open_actions_popover(self):310 def open_actions_popover(self):
311 """Open the actions popover of the file or folder."""311 """Open the actions popover of the file or folder."""
@@ -417,16 +417,10 @@
417class Dialog(ConfirmDialogWithInput):417class Dialog(ConfirmDialogWithInput):
418 """Dialog Autopilot emulator."""418 """Dialog Autopilot emulator."""
419419
420 def __init__(self, *args):
421 super(Dialog, self).__init__(*args)
422
423420
424class Popover(ConfirmDialogWithInput):421class Popover(ConfirmDialogWithInput):
425 """Popover Autopilot emulator, containing buttons and an inputfield"""422 """Popover Autopilot emulator, containing buttons and an inputfield"""
426423
427 def __init__(self, *args):
428 super(Popover, self).__init__(*args)
429
430 def click_button(self, text):424 def click_button(self, text):
431 """Click a button on the popover.425 """Click a button on the popover.
432426
433427
=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py 2014-04-28 21:06:30 +0000
+++ tests/autopilot/filemanager/tests/__init__.py 2014-05-06 18:22:40 +0000
@@ -7,7 +7,7 @@
77
8"""Filemanager app autopilot tests."""8"""Filemanager app autopilot tests."""
99
10import os.path10import os
11import shutil11import shutil
12import tempfile12import tempfile
13import logging13import logging
1414
=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py 2014-04-26 06:35:52 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py 2014-05-06 18:22:40 +0000
@@ -16,8 +16,6 @@
1616
17"""File Manager app autopilot tests."""17"""File Manager app autopilot tests."""
1818
19from __future__ import absolute_import
20
21import tempfile19import tempfile
22import unittest20import unittest
23import logging21import logging

Subscribers

People subscribed via source and target branches