Snapcraft

Merge lp://qastaging/~dholbach/snapcraft/fix-pep8-and-doc-indentation into lp://qastaging/~snappy-dev/snapcraft/core

  1. fix-pep8-and-doc-indentation
  2. Merge into core
Proposed by Daniel Holbach
Status: Superseded
Proposed branch: lp://qastaging/~dholbach/snapcraft/fix-pep8-and-doc-indentation
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 1628 lines (+399/-193)
33 files modified
docs/snapcraft-advanced-features.md (+2/-2)
examples/py2-project/sha3sum.py (+0/-1)
examples/py3-project/sha3sum.py (+0/-1)
examples/webcam-webui/config.py (+6/-3)
integration-tests/data/pypi-config/config.py (+7/-3)
runtests.sh (+1/-1)
setup.py (+4/-2)
snapcraft/__init__.py (+24/-9)
snapcraft/cmds.py (+35/-15)
snapcraft/common.py (+7/-3)
snapcraft/main.py (+34/-16)
snapcraft/meta.py (+16/-8)
snapcraft/plugin.py (+29/-13)
snapcraft/plugins/ant.py (+2/-1)
snapcraft/plugins/autotools.py (+2/-2)
snapcraft/plugins/cmake.py (+2/-2)
snapcraft/plugins/copy.py (+2/-1)
snapcraft/plugins/go.py (+2/-1)
snapcraft/plugins/maven.py (+2/-1)
snapcraft/plugins/python2.py (+4/-2)
snapcraft/plugins/python3.py (+2/-1)
snapcraft/plugins/qml.py (+10/-5)
snapcraft/repo.py (+8/-4)
snapcraft/sources.py (+37/-17)
snapcraft/tests/test_base_plugin.py (+2/-1)
snapcraft/tests/test_cmds.py (+2/-1)
snapcraft/tests/test_copy_plugin.py (+2/-1)
snapcraft/tests/test_meta.py (+26/-13)
snapcraft/tests/test_plugin.py (+4/-2)
snapcraft/tests/test_repo.py (+4/-2)
snapcraft/tests/test_sources.py (+44/-22)
snapcraft/tests/test_yaml.py (+59/-28)
snapcraft/yaml.py (+18/-9)
To merge this branch: bzr merge lp://qastaging/~dholbach/snapcraft/fix-pep8-and-doc-indentation
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Information
John Lenton (community) Approve
Sergio Schvezov Needs Fixing
Review via email: mp+273195@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2015-10-05.

Commit message

Fix markdown indentation, make pep8 and pyflakes3 happy.

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

If we are going to do this, maybe also remove the pep8 exception

review: Needs Fixing
Revision history for this message
Daniel Holbach (dholbach) wrote :

Done.

Revision history for this message
John Lenton (chipaca) wrote :

LGTM :)

review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

Attempt to merge into lp:snapcraft failed due to conflicts:

text conflict in snapcraft/cmds.py

Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

The attempt to merge lp:~dholbach/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/meta.py:115:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:116:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:118:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:119:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:149:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:150:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:156:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:157:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:172:17: E126 continuation line over-indented for hanging indent
snapcraft/plugin.py:187:17: E126 continuation line over-indented for hanging indent
snapcraft/repo.py:31:80: E501 line too long (91 > 79 characters)
snapcraft/sources.py:68:21: E126 continuation line over-indented for hanging indent
snapcraft/yaml.py:157:25: E126 continuation line over-indented for hanging indent
snapcraft/tests/test_repo.py:34:80: E501 line too long (97 > 79 characters)
snapcraft/tests/test_repo.py:51:80: E501 line too long (99 > 79 characters)
snapcraft/tests/test_repo.py:34:80: E501 line too long (97 > 79 characters)
snapcraft/tests/test_repo.py:51:80: E501 line too long (99 > 79 characters)

Revision history for this message
Daniel Holbach (dholbach) wrote :

Could this be tarmac is using an old pep8?

review: Needs Information
Revision history for this message
Daniel Holbach (dholbach) wrote :

<dholbach> elopio, do you know which version of pep8 is running on the tarmac instance? (https://code.launchpad.net/~dholbach/snapcraft/fix-pep8-and-doc-indentation/+merge/273195)
<elopio> dholbach: let me check.
<elopio> dholbach: 1.4.6-1.1build1
<dholbach> ah, ok, so that's trusty's pep8...
<elopio> dholbach: yes, tarmac is trusty.

Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

The attempt to merge lp:~dholbach/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81: undefined name 'decode'

Unmerged revisions

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