From e941f13f088959933937c6f03dda49536b2cde53 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 28 Mar 2020 19:31:20 +0100
Subject: [PATCH] Update hacking for Python3

The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found.

Update sphinx requirement, since skipping 1.5.1 is not part of
global-requirements.

Change-Id: Iea521113d66647a8d2d7e129268efb22ca2226c1
---
 sphinx_feature_classification/support_matrix.py | 2 +-
 test-requirements.txt                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_feature_classification/support_matrix.py b/sphinx_feature_classification/support_matrix.py
index fd4c401..b14de3f 100644
--- a/sphinx_feature_classification/support_matrix.py
+++ b/sphinx_feature_classification/support_matrix.py
@@ -75,7 +75,7 @@ class Matrix(object):
             if cfg.has_option(section, "status"):
                 # The value is a string "status(group)" where
                 # the 'group' part is optional
-                status, group = re.match('^([^(]+)(?:\(([^)]+)\))?$',
+                status, group = re.match(r'^([^(]+)(?:\(([^)]+)\))?$',
                                          cfg.get(section, "status")).groups()
 
                 if status not in Feature.STATUS_ALL:
diff --git a/test-requirements.txt b/test-requirements.txt
index bcf5329..ff02351 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,13 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=0.12.0,<0.13 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 coverage>=4.0,!=4.4 # Apache-2.0
 openstackdocstheme>=1.17.0  # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 ddt>=1.0.1  # MIT
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.6.1,>=1.5.1 # BSD
+sphinx>=1.6.8 # BSD
 testrepository>=0.0.18  # Apache-2.0/BSD
 testtools>=1.4.0 # MIT