Ubuntu CI Engine

Merge lp://staging/~ev/uci-engine/fix-pep8-and-pyflakes into lp://staging/uci-engine

  1. fix-pep8-and-pyflakes
  2. Merge into trunk
Proposed by Evan
Status: Needs review
Proposed branch: lp://staging/~ev/uci-engine/fix-pep8-and-pyflakes
Merge into: lp://staging/uci-engine
Diff against target: 511 lines (+39/-222)
15 files modified
bin/engine_health.py (+1/-1)
branch-source-builder/bin/check_bsbuilder.py (+1/-1)
branch-source-builder/cupstream2distro/packageinppa.py (+0/-2)
charms/precise/key-secret-subordinate/unit_tests/test_hooks.py (+1/-1)
charms/precise/system-image-server/hooks/hooks.py (+6/-14)
charms/precise/webui/unit_tests/test_hooks.py (+0/-1)
cupstream2distro/tests/unit/test_resignpackage.py (+1/-1)
docs/conf.py (+20/-191)
image-builder/imagebuilder/run_worker.py (+1/-1)
lander/setup.py (+0/-1)
nf-stats-service/nfss/__init__.py (+2/-0)
ticket_system/project/tests.py (+1/-1)
ticket_system/ticket/tests/test_style.py (+1/-1)
ticket_system/ticket/tests/test_user_info.py (+2/-2)
ticket_system/ticket_system/settings.py (+2/-4)
To merge this branch: bzr merge lp://staging/~ev/uci-engine/fix-pep8-and-pyflakes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Canonical CI Engineering Pending
Review via email: mp+242806@code.staging.launchpad.net

Commit message

PEP8 and pyflakes fixes.

Description of the change

I fixed some pyflakes and pep8 errors on the flight out to Austin.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:901
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1747/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1747/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
Robert Bruce Park (robru) wrote :

Considering that everything under cupstream2distro/ directory is an abandoned fork of lp:cupstream2distro, I hope you didn't waste too much time on that. It's probably worthwhile to delete that code or at least re-import it from our trunk, because your copy is just rotting away.

Reply
Revision history for this message
Evan (ev) wrote :

On 25 November 2014 at 20:16, ♫ Robert Bruce Park ♫
<email address hidden> wrote:
> Considering that everything under cupstream2distro/ directory is an abandoned fork of lp:cupstream2distro, I hope you didn't waste too much time on that. It's probably worthwhile to delete that code or at least re-import it from our trunk, because your copy is just rotting away.

I'm not deeply familiar with our cupstream2distro work. That's more a
question for Ursula or Francis. Guys?

Reply

Unmerged revisions

901. By Evan

Revert pyflakes-the-world change.

900. By Evan

Merge with trunk.

899. By Evan

Create a couple of exceptions to the pyflakes tests.

898. By Evan

Use the exclusion filter for pyflakes tests.

897. By Evan

Add a pyflakes check.

896. By Evan

Add a rationale for the new style test.

895. By Evan

Fix pep8 in time_sorted_tests tests.

894. By Evan

Make pep8 an opt-out, rather than opt-in test for python files. Test non-packaged python code.

893. By Evan

pyflakes fixes.

892. By Evan

pep8 fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: