Merge lp:~raharper/curtin/trunk.fix-tox-errors into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

curtin: fix tox errors in commands/main.py

Unexpectedly, pylint now blows up with the following errors:

E:208,13: Instance of 'argv' has no 'reportstack' member (but some types could
      not be inferred) (maybe-no-member)
E:209,18: Instance of 'argv' has no 'func' member (but some types could not be
      inferred) (maybe-no-member)

This code has been in tree for a very long time, this only shows up when
we added pylint to the tox run (revno 335). This should have always failed.

With that said, the fix is simple. In main(), we define args to be sys.argv
but it's not used until later we re-assign args to be something else from
argparser. Removing that useless initialization as a argv type resolves
the lint error.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:366
https://server-team-jenkins.canonical.com/job/curtin-ci/197/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/194/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/197/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

I've just verified that what changed was a change in behavior from pylint from 1.5.4 to 1.5.5 (which was uploaded 2016-03-21) https://pypi.python.org/pypi/pylint .

this is the crux of using tox.
Its obnoxious when some upload somewhere on the internet starts breaking your c-i.

The thing we could do is set the version of pylint that is installed explicitly.
That can be done with something like:
=== modified file 'tox.ini'
--- tox.ini 2016-03-18 14:05:02 +0000
+++ tox.ini 2016-03-30 23:43:34 +0000
@@ -38,7 +38,7 @@
 # set basepython because tox 1.6 (trusty) does not support generated environments
 basepython = python3
 deps = {[testenv]deps}
- pylint
+ pylint==1.5.4
     bzr+lp:simplestreams
 commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}

[Scott Moser (smoser)]

i'm ok with the change you suggest though.
The one thing is that when this code was put in, the intent was probably to allow args to be passed into main directly without the user having to modify sys.argv, but the code was lacking in doing that.

I suspect a patch like this would be more along the lines of what i intended, it also passes pylint.

http://paste.ubuntu.com/15564028/

[Ryan Harper (raharper)]

I'll likely take both your changes here once I can get vmtest to sync
images properly to my system for testing.

On Wed, Mar 30, 2016 at 6:55 PM, Scott Moser <email address hidden> wrote:

> i'm ok with the change you suggest though.
> The one thing is that when this code was put in, the intent was probably
> to allow args to be passed into main directly without the user having to
> modify sys.argv, but the code was lacking in doing that.
>
> I suspect a patch like this would be more along the lines of what i
> intended, it also passes pylint.
>
> http://paste.ubuntu.com/15564028/
> --
>
> https://code.launchpad.net/~raharper/curtin/trunk.fix-tox-errors/+merge/290531
> You are the owner of lp:~raharper/curtin/trunk.fix-tox-errors.
>

[lp:~raharper/curtin/trunk.fix-tox-errors]

367. By Ryan Harper on 2016-03-31

Further fixes: specify pylint version and restore use-case of handling args

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:367
https://server-team-jenkins.canonical.com/job/curtin-ci/198/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/195/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/198/rebuild

review: Approve (continuous-integration)

=== modified file 'curtin/commands/main.py'
--- curtin/commands/main.py	2016-01-07 16:21:29 +0000
+++ curtin/commands/main.py	2016-03-31 00:55:53 +0000
@@ -117,9 +117,9 @@
     return
 
 
-def main(args=None):
-    if args is None:
-        args = sys.argv
+def main(argv=None):
+    if argv is None:
+        argv = sys.argv[1:]
 
     stacktrace = (os.environ.get('CURTIN_STACKTRACE', "0").lower()
                   not in ("0", "false", ""))
@@ -129,7 +129,7 @@
     except ValueError:
         verbosity = 1
 
-    maybe_install_deps(sys.argv[1:], stacktrace=stacktrace,
+    maybe_install_deps(argv, stacktrace=stacktrace,
                        verbosity=verbosity)
 
     # Above here, only standard library modules can be assumed.
@@ -140,7 +140,7 @@
     subps = parser.add_subparsers(dest="subcmd")
     for subcmd in SUB_COMMAND_MODULES:
         add_subcmd(subps, subcmd)
-    args = parser.parse_args(sys.argv[1:])
+    args = parser.parse_args(argv)
 
     # merge config flags into a single config dictionary
     cfg_opts = args.main_cfgopts

=== modified file 'tox.ini'
--- tox.ini	2016-03-18 14:05:02 +0000
+++ tox.ini	2016-03-31 00:55:53 +0000
@@ -38,7 +38,7 @@
 # set basepython because tox 1.6 (trusty) does not support generated environments
 basepython = python3
 deps = {[testenv]deps}
-    pylint
+    pylint==1.5.4
     bzr+lp:simplestreams
 commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}
 
@@ -46,7 +46,7 @@
 # set basepython because tox 1.6 (trusty) does not support generated environments
 basepython = python2.7
 deps = {[testenv]deps}
-    pylint
+    pylint==1.5.4
 commands = {envpython} -m pylint --errors-only {posargs:curtin}
 
 [testenv:docs]