From 55972ab6fb656bdb8317367ef3f05159a78d2508 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Sat, 23 Jan 2021 18:51:05 +0100
Subject: [PATCH] Reconfigure tox.ini

Update minversion of tox to 3.9.0 to support inline comments [1]

Remove test-requirements and move pep8 requirements to tox.ini

[1] https://tox.readthedocs.io/en/latest/changelog.html#v3-9-0-2019-04-17

Change-Id: I5875b1ab383fef4bc49432e678e38941a7f5763e
---
 test-requirements.txt                        | 10 ----------
 tox.ini                                      |  8 ++++++--
 zuul.d/ironic-python-agent-builder-jobs.yaml |  1 -
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 test-requirements.txt

diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index e1f5e01..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.
-
-# pep8
-hacking>=3.1.0,<4.0.0 # Apache-2.0
-flake8-import-order>=0.17.1 # LGPLv3
-# documentation
-doc8>=0.6.0 # Apache-2.0
-pycodestyle>=2.0.0,<2.7.0 # MIT
diff --git a/tox.ini b/tox.ini
index 8952d22..d3819ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-minversion = 3.2.1
+minversion = 3.9.0
 envlist = pep8
 skipsdist = True
 ignore_basepython_conflict = true
@@ -12,9 +12,13 @@ setenv =
    PYTHONWARNINGS=default::DeprecationWarning
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-  -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
+deps =
+    hacking>=3.1.0,<4.0.0 # Apache-2.0
+    flake8-import-order>=0.17.1 # LGPLv3
+    doc8>=0.6.0 # Apache-2.0
+    pycodestyle>=2.0.0,<2.7.0 # MIT
 commands =
     flake8 ironic_python_agent_builder
     doc8 doc/source README.rst CONTRIBUTING.rst
diff --git a/zuul.d/ironic-python-agent-builder-jobs.yaml b/zuul.d/ironic-python-agent-builder-jobs.yaml
index cd7331e..7d67cbb 100644
--- a/zuul.d/ironic-python-agent-builder-jobs.yaml
+++ b/zuul.d/ironic-python-agent-builder-jobs.yaml
@@ -64,7 +64,6 @@
       - ^doc/.*$
       - ^releasenotes/.*$
       - ^setup.cfg$
-      - ^test-requirements.txt$
       - ^tools/.*$
       - ^tox.ini$
     vars: