Remove check-conflicts script

This script made sense back before pip had a proper dependency resolver,
but since pip 20.3 [1] this is no longer the case. Our jobs to test this
can simply install the dependencies and let pip complain if it cannot
resolve things.

[1] https://discuss.python.org/t/announcement-pip-20-3-release/5948

Change-Id: Ifc30478dfffd52f126e0ad7535468cdd0b1cd36a
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2025-09-12 15:49:19 +01:00
parent 2d88770535
commit 63a1790776
3 changed files with 4 additions and 80 deletions
@@ -1,75 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""Apply validation rules to the various requirements lists.
"""
import argparse
import sys
import traceback
import pkg_resources
from openstack_requirements.utils import read_requirements_file
def main():
parser = argparse.ArgumentParser()
parser.add_argument(
'upper_constraints',
default='upper-constraints.txt',
help='path to the upper-constraints.txt file')
parser.add_argument(
'uc_xfails',
default='upper-constraints-xfails.txt',
help='Path to the upper-constraints-xfails.txt file',
)
args = parser.parse_args()
error_count = 0
print('\nChecking %s' % args.upper_constraints)
upper_constraints = read_requirements_file(args.upper_constraints)
xfails = read_requirements_file(args.uc_xfails)
for name, spec_list in upper_constraints.items():
try:
if name:
pyver = "python_version=='%s.%s'" % (sys.version_info[0],
sys.version_info[1])
for req, original_line in spec_list:
if req.markers in ["", pyver]:
pkg_resources.require(name)
except pkg_resources.ContextualVersionConflict as e:
if e.dist.key in xfails:
xfail_requirement = xfails[e.dist.key][0][0]
xfail_denylists = set(xfail_requirement.markers.split(','))
conflict = e.dist.as_requirement()
conflict_specifiers = ''.join(conflict.specs[0])
conflict_name = conflict.name.lower()
if (e.required_by.issubset(xfail_denylists) and
xfail_requirement.package == conflict_name and
conflict_specifiers == xfail_requirement.specifiers):
print('XFAIL while checking conflicts '
'for %s: %s conflicts with %s' %
(name, e.dist, str(e.req)))
continue
print('Checking conflicts for %s:\n'
'ContextualVersionConflict: %s' % (name, str(e)))
traceback.print_exc(file=sys.stdout)
error_count += 1
return 1 if error_count else 0
-1
View File
@@ -29,7 +29,6 @@ packages =
console_scripts =
edit-constraints = openstack_requirements.cmds.edit_constraint:main
generate-constraints = openstack_requirements.cmds.generate:main
check-conflicts = openstack_requirements.cmds.check_conflicts:main
validate-constraints = openstack_requirements.cmds.validate:main
validate-projects = openstack_requirements.cmds.validate_projects:main
normalize-requirements = openstack_requirements.cmds.normalize_requirements:main
+4 -4
View File
@@ -14,22 +14,22 @@ commands =
[testenv:py310-check-uc]
basepython = python3.10
deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
commands = python -c 'print("done")'
[testenv:py311-check-uc]
basepython = python3.11
deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
commands = python -c 'print("done")'
[testenv:py312-check-uc]
basepython = python3.12
deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
commands = python -c 'print("done")'
[testenv:py313-check-uc]
basepython = python3.13
deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
commands = python -c 'print("done")'
[testenv:venv]
commands = {posargs}