Merge lp:~thomir-deactivatedaccount/autopilot/temp-dev-add-hooks into lp:~autopilot/autopilot/temp-dev

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 511
Merged at revision: 515
Proposed branch: lp:~thomir-deactivatedaccount/autopilot/temp-dev-add-hooks
Merge into: lp:~autopilot/autopilot/temp-dev
Diff against target: 35 lines (+2/-1)
3 files modified
autopilot/tests/functional/test_input_stack.py (+0/-1)
debian/control (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot/temp-dev-add-hooks
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Martin Pitt (community) Approve
Review via email: mp+220399@code.launchpad.net

Commit message

Make flake8 run as part of package build process, instead of relying on CI hooks.

Description of the change

Make flake8 run as part of package build process, instead of relying on CI hooks.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

It's ok for me, but please be aware that python3-flake8 is a scam -- it just depends on python-flake8 which provides the "flake8" binary, and flake8 isn't able to understand python 3 specific constructs. So as long as you want to keep the code python2 compatible as well, it's fine (and might be better to depend on python-flake8 explicitly).

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Pitt (pitti) wrote :

For the record, I filed the flake8 issue as https://bugs.debian.org/748838

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:509
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/425
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/425/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/749
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/749/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6616
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7460

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/97/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
510. By Thomi Richards

Merged trunk.

511. By Thomi Richards

Fix flake8 errors.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/tests/functional/test_input_stack.py'
2--- autopilot/tests/functional/test_input_stack.py 2014-05-22 06:35:09 +0000
3+++ autopilot/tests/functional/test_input_stack.py 2014-05-23 11:23:28 +0000
4@@ -35,7 +35,6 @@
5 from autopilot.input._common import get_center_point
6 from autopilot.matchers import Eventually
7 from autopilot.testcase import AutopilotTestCase, multiply_scenarios
8-from autopilot.tests.functional.fixtures import TempDesktopFile
9 from autopilot.tests.functional import QmlScriptRunnerMixin
10 from autopilot.utilities import on_test_started
11
12
13=== modified file 'debian/control'
14--- debian/control 2014-05-15 08:31:35 +0000
15+++ debian/control 2014-05-23 11:23:28 +0000
16@@ -19,6 +19,7 @@
17 python3-decorator,
18 python3-evdev,
19 python3-fixtures,
20+ python3-flake8,
21 python3-gi,
22 python3-junitxml,
23 python3-mock,
24
25=== modified file 'debian/rules'
26--- debian/rules 2014-05-21 06:44:03 +0000
27+++ debian/rules 2014-05-23 11:23:28 +0000
28@@ -12,6 +12,7 @@
29 -dh_sphinxdoc
30
31 override_dh_auto_build:
32+ flake8 autopilot
33 dh_auto_build
34 python3 setup.py build_sphinx -b html
35 python3 setup.py build_sphinx -b man

Subscribers

People subscribed via source and target branches

to all changes: