Update docs building, py27 cleanup

Update docs building, cleanup after py27 removal a bit:
* Update requirements for Sphinx and openstackdocstheme for
  python 3
* Remove unneeded sections from setup.cfg
* Remove install_command, it's unneeded, the default is fine.
* Move constraints into deps, use TOX_CONSTRAINTS instead of obsolete
  UPPER_CONSTRAINTS
* Switch to hacking 3.0, fix problems found

Change-Id: I8b5634b02b399a0678c611b7be8593280b666953

doc/requirements.txt

@@ -1,6 +1,6 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-sphinx>=1.6.2,!=1.6.6,!=1.6.7,!=2.1.0  # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.0.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0

doc/source/conf.py

@@ -45,7 +45,6 @@ copyright = u'2017, OpenStack Foundation'
 repository_name = 'openstack/kuryr-tempest-plugin'
 bug_project = 'kuryr-kubernetes'
 bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True

kuryr_tempest_plugin/tests/scenario/base.py

@@ -778,7 +778,7 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest):
                 unique_resps = set(resp for resp in responses if resp)
             else:
                 unique_resps = set(resp for resp in responses if resp
-                                   is not '')
+                                   != '')
             tester.assertEqual(amount, len(unique_resps),
                                'Incorrect amount of unique backends. '
                                'Got {}'.format(unique_resps))
@@ -1029,19 +1029,19 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest):
 
         # Check that new kuryr-controller is up and running
         for kuryr_pod_name in self.get_controller_pod_names():
-                self.wait_for_pod_status(
-                    kuryr_pod_name,
-                    namespace=system_namespace,
-                    pod_status='Running',
-                    retries=120)
+            self.wait_for_pod_status(
+                kuryr_pod_name,
+                namespace=system_namespace,
+                pod_status='Running',
+                retries=120)
 
-                # Wait until kuryr-controller pools are reloaded, i.e.,
-                # kuryr-controller is ready
-                res = test_utils.call_until_true(
-                    self.get_pod_readiness, 30, 1, kuryr_pod_name,
-                    namespace=system_namespace, container_name='controller')
-                self.assertTrue(res, 'Timed out waiting for '
-                                     'kuryr-controller to reload pools.')
+            # Wait until kuryr-controller pools are reloaded, i.e.,
+            # kuryr-controller is ready
+            res = test_utils.call_until_true(
+                self.get_pod_readiness, 30, 1, kuryr_pod_name,
+                namespace=system_namespace, container_name='controller')
+            self.assertTrue(res, 'Timed out waiting for '
+                                 'kuryr-controller to reload pools.')
 
     def update_config_map_ini_section_and_restart(
             self, name, conf_to_update, section,

kuryr_tempest_plugin/tests/scenario/test_daemon.py

@@ -27,9 +27,9 @@ class TestKuryrDaemon(base.BaseKuryrScenarioTest):
         super(TestKuryrDaemon, cls).skip_checks()
         if (not CONF.kuryr_kubernetes.containerized) or (
            not CONF.kuryr_kubernetes.kuryr_daemon_enabled):
-                raise cls.skipException("Kuryr cni should be containerized "
-                                        "and Kuryr Daemon should be enabled "
-                                        "to run this test.")
+            raise cls.skipException("Kuryr cni should be containerized "
+                                    "and Kuryr Daemon should be enabled "
+                                    "to run this test.")
 
     @decorators.idempotent_id('bddf5441-1244-a49d-a125-b5fd3fb111a7')
     def test_kuryr_cni_daemon(self):

kuryr_tempest_plugin/tests/scenario/test_network_policy.py

@@ -440,7 +440,6 @@ class TestNetworkPolicyScenario(base.BaseKuryrScenarioTest):
                 'egressSgRules': [{'security_group_rule': sg_rule}],
                 'ingressSgRules': [],
                 'networkpolicy_spec': {
-                    'podSelector': {},
                     'policyTypes': ['Ingress'],
                     'podSelector': {}},
                 'podSelector': {},

setup.cfg

@@ -24,8 +24,3 @@ packages =
 [entry_points]
 tempest.test_plugins =
     kuryr_tempest_tests = kuryr_tempest_plugin.plugin:KuryrTempestPlugin
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source

test-requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 
 bashate>=0.5.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0

tox.ini

@@ -7,10 +7,10 @@ ignore_basepython_conflict = True
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
 deps =
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
@@ -21,7 +21,9 @@ commands = {posargs}
 passenv = OS_*
 
 [testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pep8]