Upgrading for stable/rocky branch.

* Updated integration tests argument in 'run_tests.sh'.
    * Updated 'test-requirements.txt' w.r.t. stable/rocky branch.
    * Updated zuul jobs w.r.t stable/rocky constraints.
    * Added 'django-appconf<=1.0.3' library for py27 compatibility.
    * Added 'wheel' library to avoid "invalid command 'bdist_wheel'"
      error.

Change-Id: I9e1cb06908c0739432518db8b683666dc8b4c841

.zuul.yaml

@@ -3,23 +3,45 @@
     templates:
       - openstack-python-jobs
       - publish-to-pypi
+    # REVISIT: In the jobs below, the required-projects clause is needed on
+    # the master branch to select the correct version of the requirements
+    # repository. Otherwise, the master version will be used. It can be
+    # eliminated on the stable branches, and on the master branch once this
+    # repository's master branch is based on the neutron repository's master
+    # branch.
     check:
       jobs:
         - openstack-tox-pep8:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky
         - openstack-tox-py27:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky
         - openstack-tox-py35:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky
         - test-release-openstack:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky
     gate:
       jobs:
         - openstack-tox-pep8:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky
         - openstack-tox-py27:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky
         - openstack-tox-py35:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky
         - test-release-openstack:
-            nodeset: ubuntu-xenial
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/rocky

gbpui/client.py

@@ -11,6 +11,7 @@
 # under the License.
 
 from __future__ import absolute_import
+
 import logging
 
 from django.conf import settings

gbpui/horizon/tests/test_gbpui.py

@@ -26,3 +26,6 @@ class TestGbpui(base.TestCase):
 
     def test_something(self):
         pass
+
+    def __hash__(self):
+        return id(self)

gbpui/openstack_dashboard/tests/test_gbpui.py

@@ -26,3 +26,6 @@ class TestGbpui(base.TestCase):
 
     def test_something(self):
         pass
+
+    def __hash__(self):
+        return id(self)

gbpui/panels/network_services/tabs.py

@@ -11,6 +11,9 @@
 #    under the License.
 
 import json
+
+import tables as ns_tables
+
 import yaml
 
 from django.contrib.staticfiles.templatetags.staticfiles import static
@@ -24,8 +27,6 @@ from horizon import tabs
 from gbpui import client
 from gbpui import column_filters as gfilters
 
-import tables as ns_tables
-
 
 class ServiceChainSpecTab(tabs.TableTab):
     name = _("Service Chain Specs")

gbpui/panels/policytargets/restApi.py

@@ -9,6 +9,8 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+import logging
+
 import re
 
 from django.conf import settings
@@ -26,8 +28,6 @@ from gbpui import client
 from netaddr import IPAddress
 from netaddr import IPNetwork
 
-import logging
-
 LOG = logging.getLogger(__name__)
 
 

gbpui/panels/policytargets/tabs.py

@@ -10,6 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import time
+
+import tables
+
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
@@ -22,10 +26,6 @@ from openstack_dashboard.dashboards.project.instances import tables as itables
 from gbpui import client
 from gbpui import column_filters as gfilters
 
-import tables
-
-import time
-
 PTGsTable = tables.PTGsTable
 External_PTGsTable = tables.ExternalPTGsTable
 

run_tests.sh

@@ -331,7 +331,7 @@ function run_tests {
   fi
 
   if [ $with_selenium -eq 0 -a $integration -eq 0 ]; then
-      testopts="$testopts --exclude-dir=gbpui/openstack_dashboard/test/integration_tests"
+      testopts="$testopts --exclude-tag integration"
   fi
 
   if [ $selenium_headless -eq 1 ]; then
@@ -554,4 +554,4 @@ if [ $runserver -eq 1 ]; then
 fi
 
 # Full test suite
-run_tests || exit
+run_tests || exit

setup.cfg

@@ -44,3 +44,6 @@ input_file = gbpui/locale/group-based-policy-ui.pot
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = gbpui/locale/group-based-policy-ui.pot
+
+[flake8]
+import-order-style = pep8

setup.py

@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.8'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

test-requirements.txt

@@ -7,26 +7,19 @@
 # be installed in a specific order.
 #
 # Hacking should appear first in case something else depends on pep8
-
--e git://github.com/openstack/horizon.git@stable/queens#egg=horizon
-hacking<0.11,>=0.10.0
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+# Replacing Horizon git URL reference as stable/rocky constraints are applied.
+horizon
 #
-cmd2<0.9.0
+bandit>=1.4.0 # Apache-2.0
+django-appconf<=1.0.3
 coverage!=4.4,>=4.0 # Apache-2.0
-django-nose>=1.4.4 # BSD
+flake8-import-order==0.12 # LGPLv3
 mock>=2.0 # BSD
 mox3>=0.20.0  # Apache-2.0
 nodeenv>=0.9.4 # BSD
-nose>=1.3.7  # LGPL
-nose-exclude>=0.3.0  # LGPL
-nosehtmloutput>=0.0.3 # Apache-2.0
-nosexcover>=1.0.10  # BSD
-openstack.nose-plugin>=0.7 # Apache-2.0
-openstackdocstheme>=1.18.1  # Apache-2.0
-reno>=2.5.0  # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 selenium>=2.50.1 # Apache-2.0
-sphinx>=1.6.2,!=1.6.6  # BSD
 testtools>=2.2.0  # MIT
 # This also needs xvfb library installed on your OS
 xvfbwrapper>=0.1.3 #license: MIT

tox.ini

@@ -4,7 +4,6 @@ minversion = 1.6
 skipsdist = True
 
 [testenv]
-basepython = python3
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
@@ -16,8 +15,10 @@ setenv = VIRTUAL_ENV={envdir}
 # Note the hash seed is set to 0 until gbpui can be tested with a
 # random hash seed successfully.
          PYTHONHASHSEED=0
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
 commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
 
 [testenv:pep8]