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

[Nicholas Skaggs]

py3 ap conversion

DO NOT MERGE, jenkins test

[Nicholas Skaggs (nskaggs)]

Same error, hmmm.

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

[lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion]

172. By Nicholas Skaggs on 2014-05-06

revert everything, trunk build

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:171
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/197/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2441/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/197
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/197
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/147/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/197/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion]

173. By Nicholas Skaggs on 2014-05-06

add back py3 changes, revert cmakelists

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:172
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/198/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/198
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/198
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/148

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/198/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

So trunk builds fine.. Iterating changes.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/199/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2446/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/199
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/199
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/149

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/199/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion]

174. By Nicholas Skaggs on 2014-05-06

hardcode ap dir, resume using py3 in cmakelists

[David Planella (dpm)]

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:174
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/200/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2448/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/200
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/200
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/150/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/200/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion]

175. By Nicholas Skaggs on 2014-05-06

removed hardcoding, use python3 as depends

[Nicholas Skaggs (nskaggs)]

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)]

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.
>

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:175
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/201/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2449
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/201
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/201
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/151

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/201/rebuild

review: Approve (continuous-integration)

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

=== 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 @@
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               python,
                qtbase5-dev,
                qtdeclarative5-dev,
                qt5-default,
                pkg-kde-tools,
                libtag1-dev,
+               python3,
+               gettext,
 Standards-Version: 3.9.5
 Section: misc
 Homepage: https://launchpad.net/ubuntu-filemanager-app
@@ -38,7 +39,7 @@
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the Folder List model plugin of the Nemo QML 
+ This package contains the Folder List model plugin of the Nemo QML
  plugins collection.
 
 Package: ubuntu-filemanager-app-autopilot
@@ -46,8 +47,8 @@
 Depends: ${misc:Depends},
          libautopilot-qt (>= 1.4),
          libqt5test5,
-         python-mock,
          ubuntu-filemanager-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
+         python3-autopilot,
 Description: Autopilot tests for File Manager Application
  This package contains the autopilot tests for the File Manager

=== 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 @@
 if(INSTALL_TESTS)
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install(DIRECTORY ${AUTOPILOT_DIR}

=== 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 @@
 
     def get_places_popover(self):
         """Return the Places popover."""
-        if not(self.internal_wideAspect):
+        if not self.internal_wideAspect:
             # XXX It would be easier if the places popover was an object
             # that inherits from Popover, like the
             # ActionSelectionPopover does.
@@ -147,7 +147,7 @@
 
         """
         files = self.select_many(FolderListDelegate)
-        if not(self.showingListView):
+        if not self.showingListView:
             files = self.select_many(FolderIconDelegate)
         for file_ in files:
             if file_.fileName == name:
@@ -305,7 +305,7 @@
         # autopilot. Reported on
         # bug https://bugs.launchpad.net/autopilot/+bug/1195141
         # --elopio - 2013-07-25
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def open_actions_popover(self):
         """Open the actions popover of the file or folder."""
@@ -417,16 +417,10 @@
 class Dialog(ConfirmDialogWithInput):
     """Dialog Autopilot emulator."""
 
-    def __init__(self, *args):
-        super(Dialog, self).__init__(*args)
-
 
 class Popover(ConfirmDialogWithInput):
     """Popover Autopilot emulator, containing buttons and an inputfield"""
 
-    def __init__(self, *args):
-        super(Popover, self).__init__(*args)
-
     def click_button(self, text):
         """Click a button on the popover.
 

=== 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 @@
 
 """Filemanager app autopilot tests."""
 
-import os.path
+import os
 import shutil
 import tempfile
 import logging

=== 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 @@
 
 """File Manager app autopilot tests."""
 
-from __future__ import absolute_import
-
 import tempfile
 import unittest
 import logging