From e737bb29589b8d2fed3d1aa45e52c3f370dcabad Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 17 Dec 2015 16:57:10 +0100 Subject: dev-python/curtsies: Version Bump Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher --- dev-python/curtsies/Manifest | 1 + dev-python/curtsies/curtsies-0.2.4.ebuild | 38 ++++++ .../files/curtsies-0.2.4-test-backport.patch | 132 +++++++++++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 dev-python/curtsies/curtsies-0.2.4.ebuild create mode 100644 dev-python/curtsies/files/curtsies-0.2.4-test-backport.patch (limited to 'dev-python') diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest index 84852f4ca8d8..73579acf0b0d 100644 --- a/dev-python/curtsies/Manifest +++ b/dev-python/curtsies/Manifest @@ -1,2 +1,3 @@ DIST curtsies-0.1.18.tar.gz 44353 SHA256 477121f256eea2b71237492e2924f05b54e1f91815d042bf91d7112b71d4edd4 SHA512 02ae86b215dca10e779061485cb18ab8b6fefbdad10e2bcad3c24890b79f81d1aae0b84467a23ca1951ffaa336fc2fe9b5137c1a10a65fafe0a0b540cc0c819c WHIRLPOOL 801738c450c2fd9343e01260240ebd5ed74e951c03a918808c8c2c47e8ec46afe425f4d8978dea894d2cdf36bc2e3bd19e9de2ed12a62e5786eebeed87dd9800 DIST curtsies-0.2.3.tar.gz 42805 SHA256 5da88a67472ada96de3be2a9da4210080c7e4b2c1afc4c97075b3f51755e0dc4 SHA512 8d48fb147fc247b2241472543a5019a55ef1b8f029b0bb93c7de72cd9eeb1bfe9940520bb5a0509406915523b98e1dbd9f07499e9eb9649d6d70df51ba71606d WHIRLPOOL 6b3e37f630488f01b6451349fcbf5e81cde7cdf8e1590bc4c65bb9bdffb4b83f8d868c37624e3f1f932cc51d9af251914f8fa55bc88eeaacc6c2dd3eb91239ea +DIST curtsies-0.2.4.tar.gz 43313 SHA256 ae52dbb1c828369b85ed3650c846bd7bf4832916dc472220d3365c3e46e1dce6 SHA512 85ec1e87720cde03be012bb0dcb300acaac5d9a3cc3c8bd6b0e7a8d4e048abbb6ef24513ea2b8f3d106b92ac2db752c2054e699bc1ef7131f8f18e20c541fc3e WHIRLPOOL b236c072b0907115da835827078ba9363bbb199c2202bbbf7f6cabc86c47da5d1505aeaaa2fb0de1924651add2f08c0a65d8c17a9d79096b6a7d8094402d7d53 diff --git a/dev-python/curtsies/curtsies-0.2.4.ebuild b/dev-python/curtsies/curtsies-0.2.4.ebuild new file mode 100644 index 000000000000..36241d3f4922 --- /dev/null +++ b/dev-python/curtsies/curtsies-0.2.4.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 + +DESCRIPTION="Curses-like terminal wrapper, with colored strings" +HOMEPAGE="https://github.com/thomasballinger/curtsies" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + >=dev-python/blessings-1.5[${PYTHON_USEDEP}] + dev-python/pyte[${PYTHON_USEDEP}] + >=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/pyte[${PYTHON_USEDEP}] + ) +" + +PATCHES=( "${FILESDIR}"/${P}-test-backport.patch ) + +python_test() { + nosetests --verbose tests || die +} diff --git a/dev-python/curtsies/files/curtsies-0.2.4-test-backport.patch b/dev-python/curtsies/files/curtsies-0.2.4-test-backport.patch new file mode 100644 index 000000000000..8fd53d782b8d --- /dev/null +++ b/dev-python/curtsies/files/curtsies-0.2.4-test-backport.patch @@ -0,0 +1,132 @@ +From 5384f455631a973661af84bbe823b9d59af4d5b1 Mon Sep 17 00:00:00 2001 +From: Thomas Ballinger +Date: Sun, 6 Dec 2015 14:09:37 -0500 +Subject: [PATCH] skip tests when blessings Terminal can't be made + +--- + tests/test_input.py | 13 ++++++++++++- + tests/test_terminal.py | 16 ++++++++++++++++ + tests/test_window.py | 14 ++++++++++++++ + 3 files changed, 42 insertions(+), 1 deletion(-) + +diff --git a/tests/test_input.py b/tests/test_input.py +index 13cb25a..31a7d23 100644 +--- a/tests/test_input.py ++++ b/tests/test_input.py +@@ -1,20 +1,30 @@ + import os + import signal ++import sys + import threading + import time + import unittest + from mock import Mock + + try: +- from unittest import skip ++ from unittest import skip, skipIf + except ImportError: ++ + def skip(f): + return lambda self: None + ++ def skipIf(condition, reason): ++ if condition: ++ return lambda x: x ++ else: ++ return lambda x: None ++ + from curtsies import events + + from curtsies.input import Input + ++fds_closed = sys.stdin.closed or sys.stdout.closed ++ + + class CustomEvent(events.Event): + pass +@@ -24,6 +34,7 @@ class CustomScheduledEvent(events.ScheduledEvent): + pass + + ++@skipIf(fds_closed, "need open file descriptors to test") + class TestInput(unittest.TestCase): + def test_create(self): + Input() +diff --git a/tests/test_terminal.py b/tests/test_terminal.py +index 0df11b0..58f40e3 100644 +--- a/tests/test_terminal.py ++++ b/tests/test_terminal.py +@@ -17,6 +17,19 @@ + from curtsies.window import BaseWindow, FullscreenWindow, CursorAwareWindow + + ++try: ++ from unittest import skipIf ++except ImportError: ++ def skipIf(condition, reason): ++ if condition: ++ return lambda x: x ++ else: ++ return lambda x: None ++ ++ ++fds_closed = sys.stdin.closed or sys.stdout.closed ++ ++ + class FakeStdin(StringIO): + encoding = 'ascii' + +@@ -85,6 +98,7 @@ def write(self, s): + def flush(self): pass + + ++@skipIf(fds_closed, 'blessings Terminal needs streams open') + class TestFullscreenWindow(unittest.TestCase): + def setUp(self): + self.screen = pyte.Screen(10, 3) +@@ -110,6 +124,7 @@ def __enter__(*args): pass + def __exit__(*args): pass + + ++@skipIf(fds_closed, 'blessings Terminal needs streams open') + class TestCursorAwareWindow(unittest.TestCase): + def setUp(self): + self.screen = ReportingScreen(6, 3) +@@ -142,6 +157,7 @@ def test_inital_cursor_position(self): + self.assertEqual(self.screen.display, [u' ', u'hi ', u'there ']) + + ++@skipIf(fds_closed, 'blessings Terminal needs streams open') + class TestCursorAwareWindowWithExtraInput(unittest.TestCase): + def setUp(self): + self.screen = ReportingScreenWithExtra(6, 3) +diff --git a/tests/test_window.py b/tests/test_window.py +index 1f4485c..89a3480 100644 +--- a/tests/test_window.py ++++ b/tests/test_window.py +@@ -9,10 +9,24 @@ + else: + from cStringIO import StringIO + ++try: ++ from unittest import skipIf ++except ImportError: ++ def skipIf(condition, reason): ++ if condition: ++ return lambda x: x ++ else: ++ return lambda x: None ++ ++ ++fds_closed = sys.stdin.closed or sys.stdout.closed ++ ++ + class FakeFullscreenWindow(FullscreenWindow): + width = property(lambda self: 10) + height = property(lambda self: 4) + ++@skipIf(fds_closed, "blessings Terminal needs streams open") + class TestBaseWindow(unittest.TestCase): + """Pretty pathetic tests for window""" + def test_window(self): -- cgit v1.2.3-65-gdbad