From 3b174253bedf1773bce1ee07dcabec0f074250c0 Mon Sep 17 00:00:00 2001 From: Stefan Wagner Date: Mon, 6 Aug 2018 15:44:46 +0200 Subject: community/notmuch: upgrade to 0.27 --- community/notmuch/fix-tests-for-python3.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 community/notmuch/fix-tests-for-python3.patch (limited to 'community/notmuch/fix-tests-for-python3.patch') diff --git a/community/notmuch/fix-tests-for-python3.patch b/community/notmuch/fix-tests-for-python3.patch deleted file mode 100644 index 1b71751db4..0000000000 --- a/community/notmuch/fix-tests-for-python3.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix test-lib.sh for Python 3.5+. - -Since Python 3.5 json.tool does not sort JSON keys unless --sort-keys -is specified. -See https://docs.python.org/3/library/json.html#module-json.tool. - ---- a/test/test-lib.sh -+++ b/test/test-lib.sh -@@ -627,9 +627,9 @@ - # The test suite forces LC_ALL=C, but this causes Python 3 to - # decode stdin as ASCII. We need to read JSON in UTF-8, so - # override Python's stdio encoding defaults. -- output=$(echo "$1" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool \ -+ output=$(echo "$1" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool --sort-keys \ - || echo "$1") -- expected=$(echo "$2" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool \ -+ expected=$(echo "$2" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool --sort-keys \ - || echo "$2") - shift 2 - test_expect_equal "$output" "$expected" "$@" -- cgit v1.2.3