Add support for train

This adds support for the stable train branch.

Change-Id: If1fcef8ea0c3b6b6ab55078e71b982fc75e181d8

.zuul.yaml

@@ -14,26 +14,34 @@
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/stein
+                override-checkout: stable/train
         - openstack-tox-py27:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/stein
+                override-checkout: stable/train
-        - openstack-tox-py35:
+        - openstack-tox-py36:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/stein
+                override-checkout: stable/train
+        - openstack-tox-py37:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/train
     gate:
       jobs:
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/stein
+                override-checkout: stable/train
         - openstack-tox-py27:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/stein
+                override-checkout: stable/train
-        - openstack-tox-py35:
+        - openstack-tox-py36:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/stein
+                override-checkout: stable/train
+        - openstack-tox-py37:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/train

gbpclient/gbpshell.py

@@ -674,7 +674,6 @@ class GBPShell(app.App):
         subcommand = self.command_manager.find_command(argv)
         cmd_factory, cmd_name, sub_argv = subcommand
         cmd = cmd_factory(self, self.options)
-        err = None
         result = 1
         try:
             self.prepare_to_run_command(cmd)

test-requirements.txt

@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 hacking>=1.1.0 # Apache-2.0
 
-bandit>=1.1.0,<1.6.0 # Apache-2.0
+bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.12 # LGPLv3
 httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,pypy,pep8
+envlist = py27,py37,pypy,pep8
 minversion = 2.3.2
 skipsdist = True
 
@@ -11,13 +11,13 @@ setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install {opts} {packages}
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/stein}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python2.7
+basepython = python3
 commands =
   flake8
   {[testenv:bandit]commands}
@@ -28,7 +28,7 @@ basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python2.7
+basepython = python3
 commands =
   coverage erase
   coverage run -m testtools.run
@@ -40,7 +40,7 @@ commands=
     sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:bandit]
-basepython = python2.7
+basepython = python3
 # B303: blacklist calls: md5, sha1
 # B112: Test for a continue in the except block
 deps = -r{toxinidir}/test-requirements.txt