Merge lp://qastaging/~mvo/snapcraft/demo-pep8-pyflakes into lp://qastaging/~snappy-dev/snapcraft/abandoned-go-trunk
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~mvo/snapcraft/demo-pep8-pyflakes |
| Merge into: | lp://qastaging/~snappy-dev/snapcraft/abandoned-go-trunk |
| Diff against target: |
1262 lines (+1057/-0) (has conflicts) 38 files modified
.bzrignore (+3/-0) bin/snapcraft (+260/-0) examples/godd/meta/package.yaml (+5/-0) examples/godd/meta/readme.md (+1/-0) examples/godd/snapcraft.yaml (+4/-0) examples/gopaste/Makefile (+8/-0) examples/gopaste/gopaste (+10/-0) examples/gopaste/meta/package.yaml (+7/-0) examples/gopaste/meta/readme.md (+1/-0) examples/gopaste/snapcraft.yaml (+4/-0) examples/libpipeline/Makefile (+11/-0) examples/libpipeline/meta/package.yaml (+5/-0) examples/libpipeline/meta/readme.md (+1/-0) examples/libpipeline/snapcraft.yaml (+9/-0) examples/libpipeline/test.c (+18/-0) examples/webcam-webui-snap/meta/package.yaml (+7/-0) examples/webcam-webui-snap/meta/readme.md (+3/-0) examples/webcam-webui-snap/snapcraft.yaml (+6/-0) examples/webcam-webui-snap/webcam-webui (+16/-0) examples/wget-deb/meta/package.yaml (+5/-0) examples/wget-deb/meta/readme.md (+1/-0) examples/wget-deb/snapcraft.yaml (+4/-0) plugins/autotools-project.py (+32/-0) plugins/autotools-project.yaml (+6/-0) plugins/go1.4-project.py (+42/-0) plugins/go1.4-project.yaml (+7/-0) plugins/go1.4.py (+44/-0) plugins/make-project.py (+21/-0) plugins/make-project.yaml (+4/-0) plugins/manifest.txt (+97/-0) plugins/readline.yaml (+3/-0) plugins/snapcraft.py (+93/-0) plugins/tgz-content.py (+16/-0) plugins/tgz-content.yaml (+5/-0) run-checks.sh (+17/-0) snapcraft/__init__.py (+75/-0) snapcraft/common.py (+34/-0) snapcraft/plugin.py (+172/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. |
| To merge this branch: | bzr merge lp://qastaging/~mvo/snapcraft/demo-pep8-pyflakes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Snappy Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-06-30.
Commit message
pep8/pyflakes and reindent.
Description of the change
Sorry for the churn in this branch.
It fixes pep8/pyflakes issues and adds a "run-checks.py" script that enforces pep8/pyflakes. It also uses spaces instead of tabs as this is what pep8 recommends. I hope that is ok with you (ironically the reverse recommendation that go makes).
Its mostly mechanical so no human needs to go over the diff, I just didn't want to commit it directly in case there is concern about the changes :)
Unmerged revisions
- 48. By Michael Vogt
-
pep8/pyflakes
- 47. By Michael Vogt
-
run reindent.py
- 46. By Michael Terry
-
add missing Makefile
- 45. By Michael Terry
-
Fix deb packages
- 44. By Michael Terry
-
Fix some output
- 43. By Michael Terry
-
Some renames
- 42. By Michael Terry
-
Add more examples
- 41. By Michael Terry
-
Fix deb inclusion; add example for it
- 40. By Michael Terry
-
Wrap scripts when assembling
- 39. By Michael Terry
-
initial mostly-working pass at includedPackages support
