From f46c73c3cb6353a409449fdba08fdbd0856bdb35 Mon Sep 17 00:00:00 2001 From: Ilan Schnell Date: Wed, 11 Nov 2015 12:16:51 -0600 Subject: [PATCH] update changelog --- CHANGELOG.txt | 4 +++- tests/test_resolve.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d6c6dfb2fee..ca9e7b0a87d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,7 @@ -2015-XX-XX 3.18.5: +2015-11-11 3.18.5: -------------------- + * fix bad menuinst exception handling, #1798 + * add workaround for unresolved dependencies on Windows 2015-11-09 3.18.4: diff --git a/tests/test_resolve.py b/tests/test_resolve.py index 13ddb66fc03..cd49bd042d9 100644 --- a/tests/test_resolve.py +++ b/tests/test_resolve.py @@ -934,7 +934,7 @@ def test_generate_eq(): (0, u'zeromq-2.2.0-1.tar.bz2'), (1, u'zeromq-2.2.0-0.tar.bz2'), (0, u'zlib-1.2.7-0.tar.bz2') - ] + ] assert max_rhs == 1 + 2 + 3 + 2 + 1 + 1 + 2 + 2 + 3 + 11 + 5 + 1 + 20 + 2 + 1 + 4 + 1 + 1 + 1 @@ -1149,7 +1149,7 @@ def test_generate_eq(): (1, u'six-1.2.0-py33_0.tar.bz2'), (1, u'system-5.8-0.tar.bz2'), (1, u'zeromq-2.2.0-0.tar.bz2') - ] + ] assert max_rhs == 1 + 2 + 3 + 2 + 1 + 1 + 2 + 2 + 3 + 11 + 5 + 1 + 20 + 2 + 1 + 4 + 1 + 1 + 1