From ee1a3433f13f405cfb7871573c4e1ebbf31f98ac Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 14 Sep 2017 15:53:02 -0600 Subject: [PATCH] Xfail the mitmproxy / pyOpenSSL dependency conflict This is already fixed in master: https://github.com/mitmproxy/mitmproxy/pull/2435 So it'll hopefully in the next release. Because the pyOpenSSL package name and requirement name do not match we also add code to lower the name for comparison. Also the check-uc only complains about a single issue but there are 3. Change-Id: I6657802908ac4052eeb6c73fb03098b0c3557eb2 --- openstack_requirements/cmds/check_conflicts.py | 4 ++-- upper-constraints-xfails.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) 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