Snapcraft

Merge lp://qastaging/~elopio/snapcraft/fix-pep8-and-doc-indentation into lp://qastaging/~snappy-dev/snapcraft/core

fix-pep8-and-doc-indentation
Merge into core

Proposed by Leo Arias on 2015-10-05

Status:	Merged
Approved by:	Leo Arias on 2015-10-05
Approved revision:	240
Merged at revision:	232
Proposed branch:	lp://qastaging/~elopio/snapcraft/fix-pep8-and-doc-indentation
Merge into:	lp://qastaging/~snappy-dev/snapcraft/core
Diff against target:	1630 lines (+401/-193) 33 files modified docs/snapcraft-advanced-features.md (+2/-2) examples/py2-project/sha3sum.py (+0/-1) examples/py3-project/sha3sum.py (+0/-1) examples/webcam-webui/config.py (+6/-3) integration-tests/data/pypi-config/config.py (+7/-3) runtests.sh (+1/-1) setup.py (+4/-2) snapcraft/__init__.py (+24/-9) snapcraft/cmds.py (+35/-15) snapcraft/common.py (+7/-3) snapcraft/main.py (+34/-16) snapcraft/meta.py (+16/-8) snapcraft/plugin.py (+29/-13) snapcraft/plugins/ant.py (+2/-1) snapcraft/plugins/autotools.py (+2/-2) snapcraft/plugins/cmake.py (+2/-2) snapcraft/plugins/copy.py (+2/-1) snapcraft/plugins/go.py (+2/-1) snapcraft/plugins/maven.py (+2/-1) snapcraft/plugins/python2.py (+4/-2) snapcraft/plugins/python3.py (+2/-1) snapcraft/plugins/qml.py (+10/-5) snapcraft/repo.py (+8/-4) snapcraft/sources.py (+37/-17) snapcraft/tests/test_base_plugin.py (+2/-1) snapcraft/tests/test_cmds.py (+2/-1) snapcraft/tests/test_copy_plugin.py (+2/-1) snapcraft/tests/test_meta.py (+26/-13) snapcraft/tests/test_plugin.py (+4/-2) snapcraft/tests/test_repo.py (+4/-2) snapcraft/tests/test_sources.py (+45/-22) snapcraft/tests/test_yaml.py (+60/-28) snapcraft/yaml.py (+18/-9)
To merge this branch:	bzr merge lp://qastaging/~elopio/snapcraft/fix-pep8-and-doc-indentation
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Leo Arias (community)		Approve on 2015-10-05
Daniel Holbach	2015-10-05	Pending
Sergio Schvezov	2015-10-05	Pending
John Lenton	2015-10-05	Pending
Review via email: mp+273446@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-10-02.

Commit message

Fix markdown indentation, make pep8 and pyflakes3 happy.

Revision history for this message

Sergio Schvezov (sergiusens) wrote on 2015-10-02: Posted in a previous version of this proposal

If we are going to do this, maybe also remove the pep8 exception

review: Needs Fixing

Revision history for this message

Daniel Holbach (dholbach) wrote on 2015-10-03: Posted in a previous version of this proposal

Done.

Revision history for this message

John Lenton (chipaca) wrote on 2015-10-05: Posted in a previous version of this proposal

LGTM :)

review: Approve

Revision history for this message

Snappy Tarmac (snappydevtarmac) wrote on 2015-10-05: Posted in a previous version of this proposal

Attempt to merge into lp:snapcraft failed due to conflicts:

text conflict in snapcraft/cmds.py

Revision history for this message

Snappy Tarmac (snappydevtarmac) wrote on 2015-10-05: Posted in a previous version of this proposal

The attempt to merge lp:~dholbach/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/meta.py:115:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:116:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:118:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:119:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:149:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:150:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:156:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:157:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:172:17: E126 continuation line over-indented for hanging indent
snapcraft/plugin.py:187:17: E126 continuation line over-indented for hanging indent
snapcraft/repo.py:31:80: E501 line too long (91 > 79 characters)
snapcraft/sources.py:68:21: E126 continuation line over-indented for hanging indent
snapcraft/yaml.py:157:25: E126 continuation line over-indented for hanging indent
snapcraft/tests/test_repo.py:34:80: E501 line too long (97 > 79 characters)
snapcraft/tests/test_repo.py:51:80: E501 line too long (99 > 79 characters)
snapcraft/tests/test_repo.py:34:80: E501 line too long (97 > 79 characters)
snapcraft/tests/test_repo.py:51:80: E501 line too long (99 > 79 characters)

Revision history for this message

Daniel Holbach (dholbach) wrote on 2015-10-05: Posted in a previous version of this proposal

Could this be tarmac is using an old pep8?

review: Needs Information

Revision history for this message

Daniel Holbach (dholbach) wrote on 2015-10-05: Posted in a previous version of this proposal

<dholbach> elopio, do you know which version of pep8 is running on the tarmac instance? (https://code.launchpad.net/~dholbach/snapcraft/fix-pep8-and-doc-indentation/+merge/273195)
<elopio> dholbach: let me check.
<elopio> dholbach: 1.4.6-1.1build1
<dholbach> ah, ok, so that's trusty's pep8...
<elopio> dholbach: yes, tarmac is trusty.

Revision history for this message

Snappy Tarmac (snappydevtarmac) wrote on 2015-10-05: Posted in a previous version of this proposal

The attempt to merge lp:~dholbach/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81: undefined name 'decode'

Revision history for this message

Leo Arias (elopio) wrote on 2015-10-05:

Sorry for stealing your branch, but it had a small typo and we need to land this asap to avoid big conflicts. Approving again.

review: Approve

Revision history for this message

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

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

Revision history for this message

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

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

Revision history for this message

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

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

Revision history for this message

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

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

Revision history for this message

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

Download full text (4.1 KiB)

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

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/tmpu9u848ie/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmp79huuwcn/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmps1vpx7b4/parts/copy/install/dir/dst

...................................Warning: unable to find "test_relexepath" in the path
.................................F.................................
======================================================================
FAIL: test_init_with_source_branch_and_tag_raises_exception (snapcraft.tests.test_sources.TestMercurial)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_sources.py", line 275, in test_init_with_source_branch_and_tag_raises_exception
self.assertEqual(raised.exception.message, expected_message)
AssertionError: "can't specify both source-tag and source-branch for a mercurial source" != "can't specify both source-tag and source-branch "
- can't specify both source-tag and source-branch for a mercurial source
? ----------------------
+ can't specify both source-tag and source-branch

======================================================================
FAIL: test_invalid_names (snapcraft.tests.test_yaml.TestValidation) (key='package@awesome')
----------------------------------------------------------------------
Traceback (most recent call last):
File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_yaml.py", line 373, in test_invalid_names
msg=data)
AssertionError: "'package@awesome' does not match '^[a-z0-9][a-z0-9+-]*$'" != "'{}' does not match "
- 'package@awesome' does not match '^[a-z0-9][a-z0-9+-]*$'
+ '{}' does not match
: {'description': 'description which can be pretty long', 'version': '1.0-snapcraft1~ppa1', 'icon': 'my-icon.png', 'vendor': 'Me <email address hidden>', 'summary': 'my summary less that 79 chars', 'name': 'package@awesome', 'parts': {'part1': {'plugin': 'project'}}}

======================================================================
FAIL: test_invalid_names (snapcraft.tests.test_yaml.TestValidation) (key='something.another')
----------------------------------------------------------------------
Traceback (most recent call last):
File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_yaml.py", line 373, in test_invalid_names
msg=data)
AssertionError: "'something.another' does not match '^[a-z0-9][a-z0-9+-]*$'" != "'{}' does not match "
- 'something.another' does not match '^[a-z0-9][a-z0-9+-]*$'
+ '{}' does not match
: {'description': 'description which can be pretty long', 'version': '1.0-snapcraft1~ppa1', 'icon': 'my-icon.png', 'vendor': 'Me <email address hidden>', 'summary': 'my summary less that 79 chars', 'name': 'so...

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

name: # the name of the snap
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email@example.com>')
vendor: Vendor <email@example.com>
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/tmpu9u848ie/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmp79huuwcn/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmps1vpx7b4/parts/copy/install/dir/dst

...................................Warning: unable to find "test_relexepath" in the path
.................................F.................................
======================================================================
FAIL: test_init_with_source_branch_and_tag_raises_exception (snapcraft.tests.test_sources.TestMercurial)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_sources.py", line 275, in test_init_with_source_branch_and_tag_raises_exception
    self.assertEqual(raised.exception.message, expected_message)
AssertionError: "can't specify both source-tag and source-branch for a mercurial source" != "can't specify both source-tag and source-branch "
- can't specify both source-tag and source-branch for a mercurial source
?                                                 ----------------------
+ can't specify both source-tag and source-branch

======================================================================
FAIL: test_invalid_names (snapcraft.tests.test_yaml.TestValidation) (key='package@awesome')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_yaml.py", line 373, in test_invalid_names
    msg=data)
AssertionError: "'package@awesome' does not match '^[a-z0-9][a-z0-9+-]*$'" != "'{}' does not match "
- 'package@awesome' does not match '^[a-z0-9][a-z0-9+-]*$'
+ '{}' does not match 
 : {'description': 'description which can be pretty long', 'version': '1.0-snapcraft1~ppa1', 'icon': 'my-icon.png', 'vendor': 'Me <me@me.com>', 'summary': 'my summary less that 79 chars', 'name': 'package@awesome', 'parts': {'part1': {'plugin': 'project'}}}

======================================================================
FAIL: test_invalid_names (snapcraft.tests.test_yaml.TestValidation) (key='something.another')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_yaml.py", line 373, in test_invalid_names
    msg=data)
AssertionError: "'something.another' does not match '^[a-z0-9][a-z0-9+-]*$'" != "'{}' does not match "
- 'something.another' does not match '^[a-z0-9][a-z0-9+-]*$'
+ '{}' does not match 
 : {'description': 'description which can be pretty long', 'version': '1.0-snapcraft1~ppa1', 'icon': 'my-icon.png', 'vendor': 'Me <me@me.com>', 'summary': 'my summary less that 79 chars', 'name': 'something.another', 'parts': {'part1': {'plugin': 'project'}}}

======================================================================
FAIL: test_invalid_names (snapcraft.tests.test_yaml.TestValidation) (key='_hideme')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_yaml.py", line 373, in test_invalid_names
    msg=data)
AssertionError: "'_hideme' does not match '^[a-z0-9][a-z0-9+-]*$'" != "'{}' does not match "
- '_hideme' does not match '^[a-z0-9][a-z0-9+-]*$'
+ '{}' does not match 
 : {'description': 'description which can be pretty long', 'version': '1.0-snapcraft1~ppa1', 'icon': 'my-icon.png', 'vendor': 'Me <me@me.com>', 'summary': 'my summary less that 79 chars', 'name': '_hideme', 'parts': {'part1': {'plugin': 'project'}}}

----------------------------------------------------------------------
Ran 103 tests in 2.950s

FAILED (failures=4)

Revision history for this message

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

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message

Leo Arias (elopio) wrote on 2015-10-05:

oh come on!

Revision history for this message

Leo Arias (elopio) on 2015-10-05:

review: Approve

Revision history for this message

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

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/tests/test_yaml.py:372:25: E126 continuation line over-indented for hanging indent
snapcraft/tests/test_yaml.py:372:25: E126 continuation line over-indented for hanging indent

Revision history for this message

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

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message

Leo Arias (elopio) on 2015-10-05:

review: Approve

Revision history for this message

Leo Arias (elopio) wrote on 2015-10-05:

spam spam spam spam.

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

to all changes:

Leo Arias

Snappy Developers

Snapcraft

Merge lp://qastaging/~elopio/snapcraft/fix-pep8-and-doc-indentation into lp://qastaging/~snappy-dev/snapcraft/core

Commit message

Description of the change

Preview Diff

Subscribers