From 7f167721ab6f9b28111b8dbfcaf56ed393bd6b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Fri, 18 Dec 2020 15:08:53 +0100
Subject: [PATCH] Fix requirements issues

This patch is the merge of 2 current fixes that need to be solved in the
same time. Indeed each issue lock our gates independently.

Dropping lower constraints testing

We facing errors related to the new pip resolver, this
topic was discussed on the ML and QA team proposed to
to test lower-constraints [1].

I propose to drop this test because the complexity and recurring pain needed
to maintain that now exceeds the benefits provided by this mechanismes.

[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-December/019390.html

Move flake8 as a pre-commit local target.

The goal here is to avoid conflicts between flake8 and hacking version each
2 days.

Inspired from nova's approach[1].

The flake8 version to install will be determined by hacking and
requirements[2] will stay aligned instead of relying on different versions.

[1] https://opendev.org/openstack/nova/src/branch/master/.pre-commit-config.yaml#L26-L35
[2] https://opendev.org/openstack/hacking/src/branch/master/requirements.txt#L1

Co-authored-by: Daniel Bengtsson <dbengt@redhat.com>
Change-Id: I04a845fd98f0d21f7a21dae9f184117263390dd1
---
 .pre-commit-config.yaml | 8 ++++++--
 .zuul.yaml              | 1 -
 lower-constraints.txt   | 8 --------
 tox.ini                 | 6 ------
 4 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 lower-constraints.txt

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9d94556..66a040f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,9 +27,13 @@ repos:
       - id: debug-statements
       - id: check-yaml
         files: .*\.(yaml|yml)$
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3
+  - repo: local
     hooks:
       - id: flake8
+        name: flake8
         additional_dependencies:
           - hacking>=3.0.1,<3.1.0
+        language: python
+        entry: flake8
+        files: '^.*\.py$'
+        exclude: '^(doc|releasenotes|tools)/.*$'
diff --git a/.zuul.yaml b/.zuul.yaml
index 6cb91da..ee02813 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -28,7 +28,6 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-lower-constraints-jobs
       - openstack-python3-wallaby-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index 8d7b8fe..0000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-bandit==1.4.0
-keystoneauth1==3.9.0
-oslo.config==5.2.0
-oslo.i18n==3.15.3
-oslo.log==3.44.0
-openstacksdk==0.31.1
-oslotest==3.2.0
-stestr==1.0.0
diff --git a/tox.ini b/tox.ini
index 774433d..2e53113 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,11 +53,5 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
 [hacking]
 import_exceptions = oslo_limit._i18n
 
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
-
 [testenv:debug]
 commands = oslo_debug_helper -t oslo_limit/tests {posargs}
-- 
GitLab