Merge lp://qastaging/~sergiusens/snapcraft/1501496 into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Sergio Schvezov
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sergio Schvezov | ||||
Approved revision: | 226 | ||||
Merged at revision: | 225 | ||||
Proposed branch: | lp://qastaging/~sergiusens/snapcraft/1501496 | ||||
Merge into: | lp://qastaging/~snappy-dev/snapcraft/core | ||||
Diff against target: |
648 lines (+94/-67) 24 files modified
docs/snapcraft-advanced-features.md (+30/-30) docs/your-first-snap.md (+5/-5) examples/downloader-with-wiki-parts/snapcraft.yaml (+1/-1) examples/godd/snapcraft.yaml (+2/-2) examples/gopaste/snapcraft.yaml (+1/-1) examples/java-hello-world/snapcraft.yaml (+2/-2) examples/libpipeline/snapcraft.yaml (+2/-2) examples/py2-project/snapcraft.yaml (+1/-1) examples/py3-project/snapcraft.yaml (+1/-1) examples/tomcat-maven-webapp/snapcraft.yaml (+2/-2) integration-tests/data/dependencies/snapcraft.yaml (+3/-3) integration-tests/data/simple-scons/snapcraft.yaml (+1/-1) plugins/go.yaml (+0/-2) plugins/readline.yaml (+1/-1) snapcraft/plugins/ant.py (+1/-1) snapcraft/plugins/autotools.py (+1/-1) snapcraft/plugins/cmake.py (+1/-1) snapcraft/plugins/go.py (+8/-1) snapcraft/plugins/python2.py (+1/-1) snapcraft/plugins/python3.py (+1/-1) snapcraft/tests/test_wiki.py (+2/-2) snapcraft/tests/test_yaml.py (+4/-2) snapcraft/wiki.py (+2/-0) snapcraft/yaml.py (+21/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~sergiusens/snapcraft/1501496 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John Lenton (community) | Approve | ||
Review via email: mp+273027@code.qastaging.launchpad.net |
Commit message
Remove the -project from plugin names that have been released and add a deprecation message
To post a comment you must log in.
The attempt to merge lp:~sergiusens/snapcraft/1501496 into lp:snapcraft failed. Below is the output from the failed tests.
[1;31mThe project has gotten complex[0m.
Here's the list of units exceeding 10:
- snapcraft/cmds.py:
286:1: 'cmd' 13
name: # the name of the snap eq4ia4/ parts/copy/ install/ zzz z/parts/ copy/install/ dst k/parts/ copy/install/ dir/dst
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email address hidden>')
vendor: Vendor <email address hidden>
summary: # 79 char long summary
description: # A longer description for the snap
icon: # A path to an icon for the package
cp --preserve=all -R zzz /tmp/tmp4_
cp --preserve=all -R src /tmp/tmp5v8g2di
cp --preserve=all -R src /tmp/tmpvnlkjdh
....... ....... ....... ....... ....... Warning: unable to find "test_relexepath" in the path ....... ....... ....... ....... ....... F...... ....... ....... ..... ======= ======= ======= ======= ======= ======= ======= ======= ======= tests.test_ wiki.TestYaml) ------- ------- ------- ------- ------- ------- ------- ------- ------- branch. mpuFsv/ snapcraft/ tests/test_ wiki.py" , line 45, in test_get_part assertEqual( w.get_part( 'part1' ), {'type': 'go'})
.......
=======
FAIL: test_get_part (snapcraft.
-------
Traceback (most recent call last):
File "/tmp/tarmac/
self.
AssertionError: {} != {'type': 'go'}
- {}
+ {'type': 'go'}
------- ------- ------- ------- ------- ------- ------- ------- ------- -------
Ran 103 tests in 2.887s
FAILED (failures=1)