diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
| commit | eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch) | |
| tree | 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /dev-python/xlutils | |
| parent | a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff) | |
gentoo resync : 18.05.2019
Diffstat (limited to 'dev-python/xlutils')
| -rw-r--r-- | dev-python/xlutils/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch | 23 | ||||
| -rw-r--r-- | dev-python/xlutils/xlutils-2.0.0-r1.ebuild (renamed from dev-python/xlutils/xlutils-2.0.0.ebuild) | 23 |
3 files changed, 40 insertions, 9 deletions
diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest index 114a0d73bc6c..e1ce644d25e6 100644 --- a/dev-python/xlutils/Manifest +++ b/dev-python/xlutils/Manifest @@ -1,5 +1,6 @@ +AUX xlutils-2.0.0-fix-tests.patch 651 BLAKE2B 9ea3c4c51fa818b29cf715813f2fcb3e48764b50df9499a7a233d9c2b8e57b467d21529713ab64359993b5925958e25db2e1ae3d5cfab6e4c24926f940836e33 SHA512 70e38d47a07232c025da62d2f7859f1a85b6cf5516a49b31e64066cd4feda066923d5f2b6ff4d7d0339e47bb0eba1b8d090eefae516c4bbeea8ae974d842ed2a DIST xlutils-1.7.1.tar.gz 62278 BLAKE2B 5d90074a660ad15405d6a6e75e2da9a8eb45a7e516c70f4e0a1d34eb8db0d8a9b865ad0241d7d39719f77b1bcc4b3bea5e5ce358ebabc81b46a2ed6d4176ee58 SHA512 196ec5cf99e7ad5a612c455e4e293461ac89e6e93c28790e34dcce544c8689a9ab122e37458d3b6ff24137c3646607fa8768ab3a4c2fa4a3e2e59e0ac05d675a DIST xlutils-2.0.0.tar.gz 61614 BLAKE2B 51fde8ef1a0a88ecccfb3cfb332fe8a31101d29865cfa6201001d272db34a5f210e988ccb99ba00344f80dd457a5c91866af12061af9342d556953700cf02916 SHA512 7b6c39912a2b23d718b1aaac2f21770f1e5b156fdc7416f11d4a7e6b52195ffffb982aecb52b5571599eb4928c7e09bbfb20fdf2554f0c49c286b243e2fb3ea9 EBUILD xlutils-1.7.1.ebuild 870 BLAKE2B 3a0a0f91918a7b155e48a40028396cec72d5ba200edc2f6b749a15d872c5bc7ce1c7e0d2ccf631b2db18ed73371bc6f7ed3c888412fa399931451fe52ad825ba SHA512 28947f317dbfe44c3c2ad0796201ea048539346da333bfb995bd61c47a6e3788dcc9b7d75279d9690200c37d1591e3bf137659a89657064ffe274390581ea3b4 -EBUILD xlutils-2.0.0.ebuild 822 BLAKE2B ab66146ca6f0c007b84a0847994614fdfc3160ce94604b5ebb2e51c9620f71b4a171bae3260b14a5f0fceb0c4faf051a92a05a900c5fdd1987ec6607b9253627 SHA512 bf233c23083299a929f21ebfd0a5b23f460fbd00dd70f20386a3ba948e4a090bbd754cac7b094c09dd6f70d3fcc7efb90024d1b0532919237a20f05838b89115 +EBUILD xlutils-2.0.0-r1.ebuild 1036 BLAKE2B ca1b08a990956110277fe76b6fe56f571bb1c6b3491108c83e4884bb1414e854a1cf7ec5997cb2e740cba610ac8e92939f8e4e41e57ccf77bbed85fe4707bf14 SHA512 779e21c7eb8b96c44dd907c43e07533e179f938743b9ab507f5df35c34760fb37433927c43c9c0eba3828eab5707b9be52b1fc7c3f50547add202f5a91b73150 MISC metadata.xml 320 BLAKE2B 73ea3f716e530a41155508ff0562a9264659d59bf40a8bdbd4a75e3d073a83e96a6c3a520be9ce1f300c32f3e5262f231464503e36f7988ddd9972447a308459 SHA512 c83e7b88d50078775118f9c2b9a7edeef32272247ae55c30a99d1c9927b4d3fdfe12393500f93fb3a2a7ec37d0d249355d39887a4f26e75f9c24d585ae3204c4 diff --git a/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch b/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch new file mode 100644 index 000000000000..b7e74925095e --- /dev/null +++ b/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch @@ -0,0 +1,23 @@ +From e9edf279ba2e699be92da7611368cf92b4d87cec Mon Sep 17 00:00:00 2001 +From: Chris Withers <chris@simplistix.co.uk> +Date: Wed, 4 Apr 2018 08:05:06 +0100 +Subject: [PATCH] fix test expectations + +--- + xlutils/tests/test_view.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/xlutils/tests/test_view.py b/xlutils/tests/test_view.py +index 7b32892..5b4aa2b 100644 +--- a/xlutils/tests/test_view.py ++++ b/xlutils/tests/test_view.py +@@ -219,6 +219,8 @@ def test_does_not_match(self): + ('XX',) + + actual: +-(u'',)''' ++(u'',) ++ ++While comparing [5][1]: 'XX' (expected) != u'' (actual)''' + + compare(expected, actual=str(s.raised)) diff --git a/dev-python/xlutils/xlutils-2.0.0.ebuild b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild index d701317d1024..1da8b0f0d4bc 100644 --- a/dev-python/xlutils/xlutils-2.0.0.ebuild +++ b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python2_7 python3_{5,6} ) inherit distutils-r1 @@ -18,18 +18,25 @@ LICENSE="MIT" SLOT="0" RDEPEND=" - dev-python/xlwt[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}]" + >=dev-python/xlwt-1.3[${PYTHON_USEDEP}] + >=dev-python/xlrd-1.2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( - dev-python/errorhandler[${PYTHON_USEDEP}] - dev-python/manuel[${PYTHON_USEDEP}] + >=dev-python/errorhandler-2[${PYTHON_USEDEP}] + >=dev-python/manuel-1.9[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] dev-python/testfixtures[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-fix-tests.patch" +) + python_test() { - py.test -v xlutils/tests || die "Tests fail with ${EPYTHON}" + # upstream runs its tests with nose, but the suite actually runs better + # when ran through pytest... + pytest -vv || die "Tests fail with ${EPYTHON}" } |