diff options
Diffstat (limited to 'dev-python/parameterized')
-rw-r--r-- | dev-python/parameterized/Manifest | 5 | ||||
-rw-r--r-- | dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch | 101 | ||||
-rw-r--r-- | dev-python/parameterized/metadata.xml | 4 | ||||
-rw-r--r-- | dev-python/parameterized/parameterized-0.8.1-r2.ebuild (renamed from dev-python/parameterized/parameterized-0.8.1-r1.ebuild) | 12 |
4 files changed, 118 insertions, 4 deletions
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest index 0655c3be5c06..e160136b8cfb 100644 --- a/dev-python/parameterized/Manifest +++ b/dev-python/parameterized/Manifest @@ -1,3 +1,4 @@ +AUX parameterized-0.8.1-nose-to-pytest.patch 3745 BLAKE2B 739bc6c813254e3616ffa3b7fb5c057cac41df1b9d8b076a0fb570d6908e7bd740f90875add4ab6bd265f60087a396434b8641bdc75e5108afc1c790d852132d SHA512 e7e65482f15f5fb3cfba9d7dd3f66755919ab6bf7464812cfa8636bfe0c0d409576d05a0d0e7ada79e4aa1c595507b0b7c12ad13c211b9f8decb7bccfc24833f DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a -EBUILD parameterized-0.8.1-r1.ebuild 585 BLAKE2B ec6849c07af0f1678555730f68fd0098ee8812586f38ee93b57985663783c779be70d6166e051d242193242cd5ed2e688f484c36ec4ca7500cc7337825b33419 SHA512 7273afe5f5a750786b973399c7b093885d89eec43178f2bf9a0ae6f55176e04031306a39b4aa78ae5f12300c4d5fb4980bc3d2cbb2429b23b506fee3135581d8 -MISC metadata.xml 318 BLAKE2B dd75a28765343d56c2a8b29bedc13e347e9357dff3b2533ba98794a9734d71b1a1779d005077a5cc827407ceadf617abee16ea8e140f58358faf40f4ab9d6d51 SHA512 363278e4c6b8fc56a8f3290dbd6814721e14f768339a0c5cf23665162d9e268db7b57df364d63500e9b6269e146733d405092c36bd74cb6907042f8488bc39c3 +EBUILD parameterized-0.8.1-r2.ebuild 691 BLAKE2B 916f4274b4558945f2bbbc0c363b3e5c16792d2a6a8490df056906becdb8772becfba0dccb1d958df18b269fc21eab623c733bb64ceaa366a0debae9b7b76d0f SHA512 dc86cf31ab1645d8b22b494defe338623e1e4c65b4bce5830373b659053e45212a94ea2a81b201b212618ab81a77b7690f958dd20b15867de9f174d1ecc288d6 +MISC metadata.xml 419 BLAKE2B 11205a56739c16da842d2351a75ec9c66efcb0609dcf96f9c42c49d92026c83e6f57b79137efbd349680f0c58a085d17d0262ccd5bdd373b6b93cbefe40de5b1 SHA512 50416bb191c1a07ce64655ca3f289e9d94d12cf14d493b262efc01fe16d6d0951c199ff57812511aa547c4cd287a257d184dbf4b424938cf6d3ea10e96dd5641 diff --git a/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch b/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch new file mode 100644 index 000000000000..45b86d8a13af --- /dev/null +++ b/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch @@ -0,0 +1,101 @@ +diff --git a/parameterized/test.py b/parameterized/test.py +index f98d865..ede7689 100644 +--- a/parameterized/test.py ++++ b/parameterized/test.py +@@ -2,8 +2,8 @@ + + import inspect + import mock ++import pytest + from unittest import TestCase +-from nose.tools import assert_equal, assert_raises + + from .parameterized import ( + PY3, PY2, parameterized, param, parameterized_argument_value_pairs, +@@ -91,7 +91,7 @@ if not PYTEST: + + @parameterized([(1, ), (2, )]) + def test_setup(self, count, *a): +- assert_equal(self.actual_order, "setup %s" %(count, )) ++ assert self.actual_order == "setup %s" %(count, ) + missing_tests.remove("test_setup(%s)" %(self.actual_order, )) + + +@@ -235,9 +235,9 @@ class TestParamerizedOnTestCase(TestCase): + frame_locals = frame[0].f_locals + nose_test_method_name = frame_locals['a'][0]._testMethodName + expected_name = "test_on_TestCase2_custom_name_" + str(foo) +- assert_equal(nose_test_method_name, expected_name, +- "Test Method name '%s' did not get customized to expected: '%s'" % +- (nose_test_method_name, expected_name)) ++ assert nose_test_method_name == expected_name, \ ++ "Test Method name '%s' did not get customized to expected: '%s'" % \ ++ (nose_test_method_name, expected_name) + missing_tests.remove("%s(%r, bar=%r)" %(expected_name, foo, bar)) + + +@@ -259,7 +259,7 @@ class TestParameterizedExpandDocstring(TestCase): + actual_docstring = test_method.__doc__ + if rstrip: + actual_docstring = actual_docstring.rstrip() +- assert_equal(actual_docstring, expected_docstring) ++ assert actual_docstring == expected_docstring + + @parameterized.expand([param("foo")], + doc_func=lambda f, n, p: "stuff") +@@ -335,7 +335,7 @@ def test_helpful_error_on_empty_iterable_input(): + + def test_skip_test_on_empty_iterable(): + func = parameterized([], skip_on_empty=True)(lambda: None) +- assert_raises(SkipTest, func) ++ pytest.raises(SkipTest, func) + + + def test_helpful_error_on_empty_iterable_input_expand(): +@@ -366,10 +366,6 @@ def test_helpful_error_on_non_iterable_input(): + raise AssertionError("Expected exception not raised") + + +-def tearDownModule(): +- missing = sorted(list(missing_tests)) +- assert_equal(missing, []) +- + def test_old_style_classes(): + if PY3: + raise SkipTest("Py3 doesn't have old-style classes") +@@ -418,7 +414,7 @@ class TestOldStyleClass: + def test_parameterized_argument_value_pairs(func_params, p, expected): + helper = eval("lambda %s: None" %(func_params, )) + actual = parameterized_argument_value_pairs(helper, p) +- assert_equal(actual, expected) ++ assert actual == expected + + + @parameterized([ +@@ -428,7 +424,7 @@ def test_parameterized_argument_value_pairs(func_params, p, expected): + (123456789, "12...89", 4), + ]) + def test_short_repr(input, expected, n=6): +- assert_equal(short_repr(input, n=n), expected) ++ assert short_repr(input, n=n) == expected + + @parameterized([ + ("foo", ), +@@ -442,7 +438,7 @@ cases_over_10 = [(i, i+1) for i in range(11)] + + @parameterized(cases_over_10) + def test_cases_over_10(input, expected): +- assert_equal(input, expected-1) ++ assert input == expected-1 + + + @parameterized_class(("a", "b", "c"), [ +@@ -461,7 +457,7 @@ class TestParameterizedClass(TestCase): + + def _assertions(self, test_name): + assert hasattr(self, "a") +- assert_equal(self.b + self.c, 3) ++ assert self.b + self.c == 3 + missing_tests.remove("%s:%s(%r, %r, %r)" %( + self.__class__.__name__, + test_name, diff --git a/dev-python/parameterized/metadata.xml b/dev-python/parameterized/metadata.xml index d046902715bb..4ee6d8ce9ff4 100644 --- a/dev-python/parameterized/metadata.xml +++ b/dev-python/parameterized/metadata.xml @@ -4,6 +4,10 @@ <maintainer type="person"> <email>amynka@gentoo.org</email> </maintainer> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> <stabilize-allarches/> <upstream> <remote-id type="pypi">parameterized</remote-id> diff --git a/dev-python/parameterized/parameterized-0.8.1-r1.ebuild b/dev-python/parameterized/parameterized-0.8.1-r2.ebuild index e5377e43bf39..8c781e672213 100644 --- a/dev-python/parameterized/parameterized-0.8.1-r1.ebuild +++ b/dev-python/parameterized/parameterized-0.8.1-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit distutils-r1 @@ -22,4 +22,12 @@ BDEPEND=" ) " -distutils_enable_tests nose +PATCHES=( + "${FILESDIR}/${P}-nose-to-pytest.patch" +) + +distutils_enable_tests pytest + +python_test() { + epytest parameterized/test.py +} |