diff options
author | Daniel Bengtsson <dbengt@redhat.com> | 2021-03-22 10:52:10 +0100 |
---|---|---|
committer | Stephen Finucane <stephenfin@redhat.com> | 2021-04-15 15:38:52 +0100 |
commit | 4f7bb6bac2786c52027c72316359a78980ed1099 (patch) | |
tree | 88ee29d45a089f6881758f39cd13254c045253a5 | |
parent | 672919216bdf4209a2976e86f6e58850ffc9478f (diff) | |
download | oslo-middleware-4f7bb6bac2786c52027c72316359a78980ed1099.tar.gz |
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: Hervé Beraud <hberaud@redhat.com>
Change-Id: I2f41e05df1cc978821bf7cb6d9a95bf543c7fba3
(cherry picked from commit 5c806d492b22f25b79e6598b2fe3847ba6963220)
-rw-r--r-- | .pre-commit-config.yaml | 8 | ||||
-rw-r--r-- | .zuul.yaml | 1 | ||||
-rw-r--r-- | lower-constraints.txt | 43 | ||||
-rw-r--r-- | tox.ini | 6 |
4 files changed, 6 insertions, 52 deletions
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)/.*$' @@ -2,7 +2,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 c9cfdfe..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,43 +0,0 @@ -appdirs==1.3.0 -Babel==2.3.4 -bandit==1.4.0 -coverage==4.0 -debtcollector==1.2.0 -extras==1.0.0 -fixtures==3.0.0 -gitdb==0.6.4 -GitPython==1.0.1 -iso8601==0.1.11 -Jinja2==2.10 -keystoneauth1==3.4.0 -linecache2==1.0.0 -MarkupSafe==1.0 -mox3==0.20.0 -msgpack-python==0.4.0 -netaddr==0.7.18 -netifaces==0.10.4 -os-client-config==1.28.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.i18n==3.15.3 -oslo.serialization==2.18.0 -oslo.utils==3.33.0 -oslotest==3.2.0 -pbr==2.0.0 -pyparsing==2.1.0 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.12 -requests==2.14.2 -requestsexceptions==1.2.0 -rfc3986==0.3.1 -smmap==0.9.0 -statsd==3.2.1 -stestr==2.0.0 -stevedore==1.20.0 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -WebOb==1.8.0 -wrapt==1.7.0 @@ -49,9 +49,3 @@ deps = -r{toxinidir}/doc/requirements.txt commands = rm -rf releasenotes/build sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt |