Merge lp://qastaging/~sergiusens/snapcraft/config into lp://qastaging/~snappy-dev/snapcraft/core

Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: no longer in the source branch.
Merged at revision: 166
Proposed branch: lp://qastaging/~sergiusens/snapcraft/config
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Prerequisite: lp://qastaging/~sergiusens/snapcraft/collisions
Diff against target: 456 lines (+231/-65)
9 files modified
examples/webcam-webui/config.py (+57/-0)
examples/webcam-webui/setup.py (+16/-0)
examples/webcam-webui/snapcraft.yaml (+11/-1)
examples/webcam-webui/webcam-webui (+7/-1)
integration-tests/data/assemble/binary1.after (+1/-0)
schema/snapcraft.yaml (+3/-0)
snapcraft/meta.py (+33/-9)
snapcraft/sources.py (+3/-1)
snapcraft/tests/test_meta.py (+100/-53)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/config
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
John Lenton (community) Approve
Review via email: mp+270989@code.qastaging.launchpad.net

Commit message

Support config

Description of the change

This branch ends up being more complicated than necessary because I chose the config hook to be python based and setuptools rewrites the shebang. (We probably need to do the reverse in our plugin).

To post a comment you must log in.
158. By Björn Tillenius

Add support for setuptools based python projects. by bjornt approved by sergiusens,ted

159. By Sergio Schvezov

Filesets based filtering for stage and snap by sergiusens approved by sergiusens,mvo

160. By Sergio Schvezov

snapcraft init with templated values by sergiusens approved by mvo

161. By Sergio Schvezov

regex for binary and service names by sergiusens approved by mvo

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

hmm, my config.py is missing :/

162. By Sergio Schvezov

docs refresh by sergiusens approved by chipaca

163. By Sergio Schvezov

Collision logic updates with an introduction of _BUILTIN_OPTIONS so all parts have a certain set of options by default even if not declared. by sergiusens approved by mvo

164. By Daniel Holbach

fix crash when stage_packages is defined in the yaml for the plugin, but empty (getattr does not use [] as default return value in that case) by dholbach approved by sergiusens

165. By Daniel Holbach

Fix small typo. by dholbach approved by sergiusens

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

LGTM. Minor nit.

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

I fixed the nit

review: Approve
166. By Sergio Schvezov

Support config by sergiusens approved by sergiusens,chipaca

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