Merge lp://qastaging/~elopio/snapcraft/fix-pep8-and-doc-indentation into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Leo Arias
Status: | Merged |
---|---|
Approved by: | Leo Arias |
Approved revision: | 240 |
Merged at revision: | 232 |
Proposed branch: | lp://qastaging/~elopio/snapcraft/fix-pep8-and-doc-indentation |
Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
Diff against target: |
1630 lines (+401/-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 (+45/-22) snapcraft/tests/test_yaml.py (+60/-28) snapcraft/yaml.py (+18/-9) |
To merge this branch: | bzr merge lp://qastaging/~elopio/snapcraft/fix-pep8-and-doc-indentation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Leo Arias (community) | Approve | ||
Daniel Holbach | Pending | ||
Sergio Schvezov | Pending | ||
John Lenton | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2015-10-02.
Commit message
Fix markdown indentation, make pep8 and pyflakes3 happy.
To post a comment you must log in.
If we are going to do this, maybe also remove the pep8 exception