diff --git a/openstack_requirements/cmds/check_conflicts.py b/openstack_requirements/cmds/check_conflicts.py index e5ec58f932..2e1399fed0 100644 --- a/openstack_requirements/cmds/check_conflicts.py +++ b/openstack_requirements/cmds/check_conflicts.py @@ -58,15 +58,15 @@ def main(): 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_blacklists = 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_blacklists) and - xfail_requirement.package == conflict.name and + xfail_requirement.package == conflict_name and conflict_specifiers == xfail_requirement.specifiers): print ('XFAIL while checking conflicts ' diff --git a/upper-constraints-xfails.txt b/upper-constraints-xfails.txt index 496b15aede..b6d9c5a54d 100644 --- a/upper-constraints-xfails.txt +++ b/upper-constraints-xfails.txt @@ -1,2 +1,5 @@ # Format is # ==; +pyopenssl==17.2.0;mitmproxy +pyasn1==0.3.3;mitmproxy +cryptography==2.0.3;mitmproxy