Snapcraft

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

1501496
Merge into core

Proposed by Sergio Schvezov on 2015-10-01

Status:

Merged

Approved by:

Sergio Schvezov on 2015-10-01

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:

Bug #1501496: Drop -project for plugins

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
John Lenton (community)		2015-10-01	Approve on 2015-10-01
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

Revision history for this message

John Lenton (chipaca) on 2015-10-01:

review: Approve

Revision history for this message

Snappy Tarmac (snappydevtarmac) wrote on 2015-10-01:

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
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_eq4ia4/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmp5v8g2diz/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmpvnlkjdhk/parts/copy/install/dir/dst

...................................Warning: unable to find "test_relexepath" in the path
..........................................F.........................
======================================================================
FAIL: test_get_part (snapcraft.tests.test_wiki.TestYaml)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/tmp/tarmac/branch.mpuFsv/snapcraft/tests/test_wiki.py", line 45, in test_get_part
self.assertEqual(w.get_part('part1'), {'type': 'go'})
AssertionError: {} != {'type': 'go'}
- {}
+ {'type': 'go'}

----------------------------------------------------------------------
Ran 103 tests in 2.887s

FAILED (failures=1)

Revision history for this message

Snappy Tarmac (snappydevtarmac) wrote on 2015-10-01:

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
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/tmpib37ar12/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmpd55xvtps/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmprcfoplg9/parts/copy/install/dir/dst

...................................Warning: unable to find "test_relexepath" in the path
..........................................F.........................
======================================================================
FAIL: test_get_part (snapcraft.tests.test_wiki.TestYaml)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/tmp/tarmac/branch.6kWKxD/snapcraft/tests/test_wiki.py", line 45, in test_get_part
self.assertEqual(w.get_part('part1'), {'type': 'go'})
AssertionError: {} != {'type': 'go'}
- {}
+ {'type': 'go'}