From 5e5d39daeaa4047553a782a607ca5d536d8710e1 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 12 Jan 2021 09:29:28 -0700
Subject: [PATCH] Clean up CI

CI is failing trying to resolve dependencies. We can fix this by bumping
hacking to a newer version. Additionally drop the lower-constraints job

Change-Id: If5473a753e774767abf60b9fcf9f57a9aa31b580
---
 lower-constraints.txt | 33 ---------------------------------
 test-requirements.txt |  2 +-
 tox.ini               |  6 ------
 zuul.d/layout.yaml    |  1 -
 4 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 lower-constraints.txt

diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index 032cac6..0000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-alabaster==0.7.10
-anyjson==0.3.3
-Babel==2.3.4
-coverage==4.0
-docutils==0.11
-extras==1.0.0
-fixtures==3.0.0
-flake8==2.5.5
-hacking==0.12.0
-imagesize==0.7.1
-Jinja2==2.10
-linecache2==1.0.0
-MarkupSafe==1.0
-mccabe==0.2.1
-pbr==2.0.0
-pep8==1.5.7
-pyflakes==0.8.1
-Pygments==2.2.0
-pystache==0.5.4
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.12
-requests==2.14.2
-six==1.10.0
-snowballstemmer==1.2.1
-Sphinx==1.6.5
-sphinxcontrib-websupport==1.0.1
-stestr==2.0.0
-testscenarios==0.4
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
index de9adfe..8c73397 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # 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.
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=4.0.0,<4.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index f22fd1d..5261303 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,9 +35,3 @@ commands = {posargs}
 [flake8]
 exclude = .venv,.tox,dist,doc,*.egg
 show-source = true
-
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index a4bf884..e9654e0 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -2,6 +2,5 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
       - openstack-python3-victoria-jobs
       - tripleo-multinode-container-minimal