Snapcraft

Merge lp://qastaging/~sergiusens/snapcraft/meta-all-yaml into lp://qastaging/~snappy-dev/snapcraft/core

  1. meta-all-yaml
  2. Merge into core
Proposed by Sergio Schvezov
Status: Merged
Approved by: John Lenton
Approved revision: 143
Merged at revision: 140
Proposed branch: lp://qastaging/~sergiusens/snapcraft/meta-all-yaml
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 1292 lines (+659/-214)
51 files modified
examples/godd/meta/package.yaml (+0/-5)
examples/godd/meta/readme.md (+0/-1)
examples/godd/snapcraft.yaml (+8/-1)
examples/gopaste/meta/package.yaml (+0/-7)
examples/gopaste/meta/readme.md (+0/-1)
examples/gopaste/snapcraft.yaml (+10/-1)
examples/java-hello-world/meta/package.yaml (+0/-6)
examples/java-hello-world/meta/readme.md (+0/-1)
examples/java-hello-world/snapcraft.yaml (+9/-1)
examples/libpipeline/meta/package.yaml (+0/-5)
examples/libpipeline/meta/readme.md (+0/-1)
examples/libpipeline/snapcraft.yaml (+8/-1)
examples/py2-project/meta/package.yaml (+0/-5)
examples/py2-project/meta/readme.md (+0/-1)
examples/py2-project/snapcraft.yaml (+8/-1)
examples/py3-project/meta/package.yaml (+0/-5)
examples/py3-project/meta/readme.md (+0/-1)
examples/py3-project/snapcraft.yaml (+8/-1)
examples/qmldemo/snapcraft.yaml (+14/-2)
examples/tomcat-maven-webapp/meta/package.yaml (+0/-12)
examples/tomcat-maven-webapp/meta/readme.md (+0/-3)
examples/tomcat-maven-webapp/snapcraft.yaml (+14/-1)
examples/webcam-webui-snap/meta/package.yaml (+0/-7)
examples/webcam-webui-snap/meta/readme.md (+0/-3)
examples/webcam-webui-snap/snapcraft.yaml (+10/-1)
examples/wget-deb/meta/package.yaml (+0/-5)
examples/wget-deb/meta/readme.md (+0/-1)
examples/wget-deb/snapcraft.yaml (+8/-1)
integration-tests/data/assemble/package.yaml.after (+0/-13)
integration-tests/data/assemble/snapcraft.yaml (+15/-0)
integration-tests/data/bzr-head/snapcraft.yaml (+6/-0)
integration-tests/data/bzr-tag/snapcraft.yaml (+6/-0)
integration-tests/data/conflicts/snapcraft.yaml (+6/-0)
integration-tests/data/dependencies/snapcraft.yaml (+6/-0)
integration-tests/data/git-branch/snapcraft.yaml (+6/-0)
integration-tests/data/git-head/snapcraft.yaml (+6/-0)
integration-tests/data/git-tag/snapcraft.yaml (+6/-0)
integration-tests/data/hg-branch/snapcraft.yaml (+6/-0)
integration-tests/data/hg-head/snapcraft.yaml (+6/-0)
integration-tests/data/hg-tag/snapcraft.yaml (+6/-0)
integration-tests/data/local-plugin/snapcraft.yaml (+6/-0)
integration-tests/data/local-source/snapcraft.yaml (+6/-0)
integration-tests/data/simple-cmake/snapcraft.yaml (+6/-0)
integration-tests/data/simple-copy/snapcraft.yaml (+6/-0)
integration-tests/data/simple-make/snapcraft.yaml (+6/-0)
integration-tests/data/simple-tar/snapcraft.yaml (+6/-0)
integration-tests/units/jobs.pxu (+0/-13)
snapcraft/cmds.py (+13/-88)
snapcraft/meta.py (+180/-0)
snapcraft/tests/test_cmds.py (+0/-19)
snapcraft/tests/test_meta.py (+258/-0)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/meta-all-yaml
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Leo Arias (community) Approve
Review via email: mp+269100@code.qastaging.launchpad.net

Commit message

Generate meta (package.yaml and readme.md) from snapcraft.yaml

Description of the change

This will break many of the current snapcraft implementations so before merging this it would be good to have daily builds disabled.

Additionally this raises the usefulness of assemble (maybe we can be smarter) and detect a manual 'meta' and warn about it.

Code coverage seems high, but I didn't cover one line of code from migrated code which I can do in another MP.

To post a comment you must log in.
lp://qastaging/~sergiusens/snapcraft/meta-all-yaml updated
138. By Sergio Schvezov

rogue deprecated assertEquals

139. By Sergio Schvezov

updating examples

140. By Sergio Schvezov

take into account the optional type and frameworks

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

Forgot to add the examples (I had only touched the integration tests and had forgotten). I also added two rather important keys missing from the spec, type and frameworks

Revision history for this message
Leo Arias (elopio) wrote :

Cool stuff with tests :)
Some of the branches from the wrap methods are not tested. This is already big, so feel free to make a card or a bug for that.

Plenty of comments in the diff.

review: Needs Fixing
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

> Cool stuff with tests :)

Thanks for the review
> Some of the branches from the wrap methods are not tested. This is already
> big, so feel free to make a card or a bug for that.

_wrap_tests is not new code, just moved, so I won't be adding tests in this MP for it and leave a TODO.

> Plenty of comments in the diff.

Thanks, I will take a look now

lp://qastaging/~sergiusens/snapcraft/meta-all-yaml updated
141. By Sergio Schvezov

First round of review fixes

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

I addressed most of the review comments, please take another look.

Revision history for this message
Sergio Schvezov (sergiusens) :
Revision history for this message
Leo Arias (elopio) wrote :

Ok, I'm happy with this. I just proposed a branch with the patcher change and the tests passing:
https://code.launchpad.net/~elopio/snapcraft/patcher/+merge/269239

What's important is to use addCleanup instead of tearDown. From the docs: "if an exception is raised in the setUp then tearDown is not called."

Leaving my +1. Thanks Sergio!

review: Approve
lp://qastaging/~sergiusens/snapcraft/meta-all-yaml updated
142. By Sergio Schvezov

testing fixes from elopio

143. By Sergio Schvezov

Merging trunk

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

Can we have single-file config in snappy too?

review: Approve

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