From 7344c15b016401fef2947d27f07a4933a87f5cfb Mon Sep 17 00:00:00 2001
From: Brad Cowie <brad@wand.net.nz>
Date: Tue, 12 May 2020 15:16:06 +1200
Subject: [PATCH 1/4] pylint

---
 ryu/tests/unit/lib/test_ofctl_action_match.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ryu/tests/unit/lib/test_ofctl_action_match.py b/ryu/tests/unit/lib/test_ofctl_action_match.py
index 11e27f78..9e9f2e46 100644
--- a/ryu/tests/unit/lib/test_ofctl_action_match.py
+++ b/ryu/tests/unit/lib/test_ofctl_action_match.py
@@ -413,7 +413,7 @@ class Test_ofctl(unittest.TestCase):
                 # without mask
                 eq_(eth, field_value)
             return
-        elif key in['nw_src', 'nw_dst', 'arp_spa', 'arp_tpa']:
+        elif key in ['nw_src', 'nw_dst', 'arp_spa', 'arp_tpa']:
             # IPv4 address
             if test.ver == ofproto_v1_0.OFP_VERSION:
                 ipv4, mask = _to_match_ip(value)

From 9b002e0eece436ad72e2ec8b250620f78277c567 Mon Sep 17 00:00:00 2001
From: Brad Cowie <brad@wand.net.nz>
Date: Tue, 12 May 2020 15:25:05 +1200
Subject: [PATCH 2/4] Update python versions for tox test environments.

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0ce5d205..cf263bc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,12 @@ matrix:
     - python: 3.5
       env: TOX_ENV=py35
 
-    - python: 3.7-dev
+    - python: 3.7
       env: TOX_ENV=py37
 
+    - python: 3.8
+      env: TOX_ENV=py38
+
 # This is disabled because of trouble running on travis CI.
 #    - python: pypy
 #      env: TOX_ENV=pypy

From dea688e5a68c31fcf2e059c1b65a7c0a3fbc6856 Mon Sep 17 00:00:00 2001
From: Brad Cowie <brad@wand.net.nz>
Date: Tue, 12 May 2020 15:41:15 +1200
Subject: [PATCH 3/4] Upgrade to ubuntu bionic.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index cf263bc3..468b67ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+dist: bionic
+
 language: python
 
 matrix:

From 15382e497216e6f243d9496488e50fcd014e18f2 Mon Sep 17 00:00:00 2001
From: Brad Cowie <brad@wand.net.nz>
Date: Fri, 12 Jun 2020 11:23:03 +1200
Subject: [PATCH 4/4] Don't need to keep our requirements in sync with
 OpenStack.

---
 ryu/tests/unit/test_requirements.py | 85 -----------------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 ryu/tests/unit/test_requirements.py

diff --git a/ryu/tests/unit/test_requirements.py b/ryu/tests/unit/test_requirements.py
deleted file mode 100644
index c842a0f0..00000000
--- a/ryu/tests/unit/test_requirements.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (C) 2016 Nippon Telegraph and Telephone Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT 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 os
-import sys
-import unittest
-
-import pkg_resources
-from six.moves import urllib
-
-from nose.tools import ok_
-
-
-LOG = logging.getLogger(__name__)
-
-MOD_DIR = os.path.dirname('file://' + sys.modules[__name__].__file__)
-_RYU_REQUIREMENTS_FILES = [
-    '../../../tools/pip-requires',
-    '../../../tools/optional-requires',
-]
-RYU_REQUIREMENTS_FILES = [
-    os.path.join(MOD_DIR, f) for f in _RYU_REQUIREMENTS_FILES]
-
-OPENSTACK_REQUIREMENTS_REPO = 'https://github.com/openstack/requirements'
-OPENSTACK_REQUIREMENTS_URL = (
-    'https://github.com/openstack/requirements/raw/master/')
-_OPENSTACK_REQUIREMENTS_FILES = [
-    'requirements.txt',
-    'global-requirements.txt',
-]
-OPENSTACK_REQUIREMENTS_FILES = [
-    urllib.parse.urljoin(OPENSTACK_REQUIREMENTS_URL, f)
-    for f in _OPENSTACK_REQUIREMENTS_FILES]
-
-
-def _get_requirements(files):
-    requirements = {}
-    for f in files:
-        response = urllib.request.urlopen(f)
-        contents = response.read().decode('utf-8')
-        for r in pkg_resources.parse_requirements(contents):
-            requirements[r.name] = str(r)
-
-    return requirements
-
-
-OPENSTACK_REQUIREMENTS = _get_requirements(OPENSTACK_REQUIREMENTS_FILES)
-RYU_REQUIREMENTS = _get_requirements(RYU_REQUIREMENTS_FILES)
-
-
-class TestRequirements(unittest.TestCase):
-    """
-    Test whether the requirements of Ryu has no conflict with that
-    of other projects.
-    """
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def test_with_openstack_requirements(self):
-        try:
-            for name, req in OPENSTACK_REQUIREMENTS.items():
-                if name in RYU_REQUIREMENTS:
-                    ok_(pkg_resources.require(req))
-        except pkg_resources.VersionConflict as e:
-            LOG.exception(
-                'Some requirements of Ryu are conflicting with that of '
-                'OpenStack project: %s', OPENSTACK_REQUIREMENTS_REPO)
-            raise e