From 65f1c2f6cc73de202c1480c5fc412307eb52e84a Mon Sep 17 00:00:00 2001
From: Shyam Singh <shyam81295@gmail.com>
Date: Sat, 16 May 2020 15:20:29 +0530
Subject: [PATCH] Replace openstack.org URLs with 'git+https://'

 * If installing from a VCS URL then it should begin with (svn+, git+,
    hg+, or bzr+).

 * Replaced github.com & opendev.org URLs with
    "git+https://...".

 * Added openstack-tox-py35 zuul CI job

Fixes bug 1879034

Change-Id: I78cd359e2499636a642836a87fe892f39e00f3a3
(cherry picked from commit 9d80d080950a61bf77fcca770bdaf71cef796977)
---
 .zuul.yaml            | 21 +++++++++++++++++++++
 test-requirements.txt |  7 ++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 .zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..d6489c2
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,21 @@
+- project:
+    name: x/group-based-policy-automation
+    templates:
+      - openstack-python-jobs
+      - publish-to-pypi
+    check:
+      jobs:
+        - openstack-tox-pep8:
+            nodeset: ubuntu-xenial
+        - openstack-tox-py27:
+            nodeset: ubuntu-xenial
+        - openstack-tox-py35:
+            nodeset: ubuntu-xenial
+    gate:
+      jobs:
+        - openstack-tox-pep8:
+            nodeset: ubuntu-xenial
+        - openstack-tox-py27:
+            nodeset: ubuntu-xenial
+        - openstack-tox-py35:
+            nodeset: ubuntu-xenial
\ No newline at end of file
diff --git a/test-requirements.txt b/test-requirements.txt
index 84629ef..a4cb336 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,8 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
--e git://github.com/openstack/heat.git@stable/queens#egg=heat
--e https://git.openstack.org/openstack/python-group-based-policy-client.git@stable/queens#egg=gbpclient
+-e git+https://opendev.org/openstack/heat.git@stable/queens#egg=heat
+-e git+https://opendev.org/x/python-group-based-policy-client.git@stable/queens#egg=gbpclient
 # Hacking already pins down pep8, pyflakes and flake8
 hacking<0.11,>=0.10.0
 bandit>=1.1.0 # Apache-2.0
@@ -19,7 +19,8 @@ os-testr>=1.0.0  # Apache-2.0
 oslotest>=3.2.0  # Apache-2.0
 qpid-python>=0.26;python_version=='2.7'  # Apache-2.0
 psycopg2>=2.6.2  # LGPL/ZPL
-sphinx>=1.6.2,!=1.6.6  # BSD
+sphinx!=1.6.6,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0  # MIT