* [gentoo-commits] repo/gentoo:master commit in: dev-python/unittest2/, dev-python/unittest2/files/
@ 2015-11-02 11:50 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-11-02 11:50 UTC (permalink / raw
To: gentoo-commits
commit: f6c9500bd2ec056679a51f99e971823b717f9a1a
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 16:18:15 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 2 11:47:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c9500b
dev-python/unittest2: Fix for test failures in python3.5
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../files/unittest2-1.1.0-python3.5-test.patch | 28 ++++++++++++++++++++++
dev-python/unittest2/unittest2-1.1.0.ebuild | 11 +++++----
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
new file mode 100644
index 0000000..78d71c9
--- /dev/null
+++ b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
@@ -0,0 +1,28 @@
+diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py
+index 683f662..347eea5 100644
+--- a/unittest2/test/test_loader.py
++++ b/unittest2/test/test_loader.py
+@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase):
+ #
+ # What happens when an impossible name is given, relative to the provided
+ # `module`?
++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here")
+ def test_loadTestsFromName__relative_malformed_name(self):
+ loader = unittest.TestLoader()
+
+@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase):
+ # TestCase or TestSuite instance."
+ #
+ # What happens when presented with an impossible module name?
++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here")
+ def test_loadTestsFromNames__malformed_name(self):
+ loader = unittest2.TestLoader()
+
+@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase):
+ # "The method optionally resolves name relative to the given module"
+ #
+ # What happens when presented with an impossible attribute name?
++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here")
+ def test_loadTestsFromNames__relative_malformed_name(self):
+ loader = unittest.TestLoader()
+
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 7c7f4e3..0c3649b 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -9,12 +9,12 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="The new features in unittest backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2"
+HOMEPAGE="https://pypi.python.org/pypi/unittest2 https://github.com/testing-cabal/unittest-ext"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
CDEPEND="
@@ -26,8 +26,11 @@ CDEPEND="
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}"
-PATCHES=( "${FILESDIR}"/remove-argparse-dependence.patch )
+PATCHES=(
+ "${FILESDIR}"/remove-argparse-dependence.patch
+ "${FILESDIR}"/${P}-python3.5-test.patch
+)
python_test() {
- "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+ "${PYTHON}" -m unittest2 discover --verbose || die "tests failed under ${EPYTHON}"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/unittest2/, dev-python/unittest2/files/
@ 2015-11-23 10:05 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-11-23 10:05 UTC (permalink / raw
To: gentoo-commits
commit: 0c4b99a75bbe488f10c4e25d759cf8ef7ed06dd2
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 09:25:46 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 10:05:31 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4b99a7
dev-python/unittest2: Drop old
obsoletes
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=501638
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/unittest2/Manifest | 3 --
.../unittest2/files/unittest2-0.8.0-argparse.patch | 15 ------
dev-python/unittest2/metadata.xml | 2 +-
dev-python/unittest2/unittest2-0.5.1-r1.ebuild | 54 -------------------
dev-python/unittest2/unittest2-0.5.1-r2.ebuild | 61 ----------------------
dev-python/unittest2/unittest2-0.8.0.ebuild | 31 -----------
6 files changed, 1 insertion(+), 165 deletions(-)
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index c0e511a..6552ecb 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,2 @@
-DIST unittest2-0.5.1.tar.gz 62470 SHA256 aa5de8cdf654d843379c97bd1ee240e86356d3355a97b147a6f3f4d149247a71 SHA512 3979d94fd4e1038ec134dd2342d614766383177eadd0cc3c38b964528157fbbe466800d1a7422cf647500784af8e0c2caa750a364a33c9f761dca37d7bbb598f WHIRLPOOL d66d0b37c1646280e81035fde287f14c042fb2820434b27490aca49b265340ec76636315bfc9aa413a4c1f2d3be90a9e86da54f1149425ef09f7366d295f50b4
-DIST unittest2-0.8.0.tar.gz 78312 SHA256 bb00b9c261cf3fa6b84cc3e6c3a39edf74b3140345b3f677907635a2738a7e2a SHA512 f5e3083e236ff5ad2b3149a5d31e1a0ed20e0bd3283eacec0c5d12c143afb60a92163a27c25424348872db7fcfa11d4230af468a0e67a41cb32ed9dcd5566607 WHIRLPOOL c35b23f967b30864417be11b75c29a1cb93126eb09096cc3366b4a32970af2b09e97ddd15ee32f12f6773aa9bedc89e64491516dd1f759bb35d760a18db217ff
DIST unittest2-1.0.1.tar.gz 80516 SHA256 ccec0aa70cae02253e6dac861591043f41854b77d7d24dc606dc300769d013c1 SHA512 68e5d6609282e0b2b4134481f25357aaeaa413e83b15695072651db8c3ac32b97fd7f5f329599cb9b0fda29c7e6bd6c5dc83ed12a0a36414912779cfb6bc1899 WHIRLPOOL c4b8c59b7390000916be62c2549d5b9db7c93514166009c5c6f120cd617371f400734a7a3c231903df5fc4817ac10a7572a08b366d3e97a23bc1d7aa456203fa
DIST unittest2-1.1.0.tar.gz 81432 SHA256 22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579 SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa WHIRLPOOL d375c59aed23e4fce14499df2fb64d185facc1e25378805045c66eef9c2fa14de81d7580020300c374f7842d38aaf6ccb26df4ff9a430f6ad497863e2766dc83
-DIST unittest2py3k-0.5.1.tar.gz 55493 SHA256 78249c5f1ac508a34d9d131d43a89d77bf154186f3ea5f7a6b993d3f3535d403 SHA512 d56a416355abd905f22f5bdceab8305f8f2e28b17dd1250d4c2ab637e20745836a8bc0c8ba1356122b355ba6ad43c9a7b4284699a8b54fe6d8612b9c4565be2b WHIRLPOOL 526ae793735aa5c5eaa490d3a5fbd2a11ffe9e83d22fd246dd165891c4f03733484e3bb38b68d07ec12379298f19b358181feb2ef584db9e421ed6dcbfc367cd
diff --git a/dev-python/unittest2/files/unittest2-0.8.0-argparse.patch b/dev-python/unittest2/files/unittest2-0.8.0-argparse.patch
deleted file mode 100644
index 4435511..0000000
--- a/dev-python/unittest2/files/unittest2-0.8.0-argparse.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-argparse is in standard library in Python 2.7 and >=3.2
-https://code.google.com/p/unittest-ext/issues/detail?id=88
---- a/setup.py
-+++ b/setup.py
-@@ -57,7 +57,9 @@
- # Both install and setup requires - because we read VERSION from within the
- # package, and the package also exports all the APIs.
- # six for compat helpers
--REQUIRES = ['argparse', 'six'],
-+REQUIRES = ['six']
-+if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 2):
-+ REQUIRES.append('argparse')
-
- params = dict(
- name=NAME,
diff --git a/dev-python/unittest2/metadata.xml b/dev-python/unittest2/metadata.xml
index c65c4d2..e38a59a 100644
--- a/dev-python/unittest2/metadata.xml
+++ b/dev-python/unittest2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/unittest2/unittest2-0.5.1-r1.ebuild b/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
deleted file mode 100644
index f273116..0000000
--- a/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1
-
-PY3_P=${PN}py3k-${PV}
-
-DESCRIPTION="The new features in unittest for Python 2.7 backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2
- https://pypi.python.org/pypi/unittest2py3k https://code.google.com/p/unittest-ext/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- mirror://pypi/${PN:0:1}/${PN}/${PY3_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
- # Disable versioning of unit2 script to avoid collision with versioning performed by distutils_src_install().
- sed -i -e "/'%s = unittest2:main_' % SCRIPT2,/d" setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-select_source() {
- if [[ ${EPYTHON} == python3* ]]; then
- cd "${WORKDIR}"/${PY3_P} || die
- else
- cd "${S}" || die
- fi
-}
-
-python_compile() {
- select_source
- distutils-r1_python_compile
-}
-
-python_test() {
- cd "${BUILD_DIR}" || die
- scripts/unit2 discover -s lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- select_source
- distutils-r1_python_install
-}
diff --git a/dev-python/unittest2/unittest2-0.5.1-r2.ebuild b/dev-python/unittest2/unittest2-0.5.1-r2.ebuild
deleted file mode 100644
index 7b37c39..0000000
--- a/dev-python/unittest2/unittest2-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-PY3_P=${PN}py3k-${PV}
-
-DESCRIPTION="The new features in unittest for Python 2.7 backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2
- https://pypi.python.org/pypi/unittest2py3k https://code.google.com/p/unittest-ext/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- mirror://pypi/${PN:0:1}/${PN}/${PY3_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
- local d
- for d in "${S}" "${WORKDIR}"/${PY3_P}; do
- # Disable versioning of unit2 script to avoid collision with versioning performed by distutils_src_install().
- sed -i -e "/'%s = unittest2:main_' % SCRIPT2,/d" \
- "${d}"/setup.py || die
-
- sed -i -e '/No module named/s/self.*$/pass/' \
- "${d}"/unittest2/test/test_loader.py || die
- done
-
- distutils-r1_python_prepare_all
-}
-
-select_source() {
- if [[ ${EPYTHON} == python3* ]]; then
- cd "${WORKDIR}"/${PY3_P} || die
- else
- cd "${S}" || die
- fi
-}
-
-python_compile() {
- select_source
- distutils-r1_python_compile
-}
-
-python_test() {
- cd "${BUILD_DIR}" || die
- scripts/unit2 discover -s lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- select_source
- distutils-r1_python_install
-}
diff --git a/dev-python/unittest2/unittest2-0.8.0.ebuild b/dev-python/unittest2/unittest2-0.8.0.ebuild
deleted file mode 100644
index f8eebf7..0000000
--- a/dev-python/unittest2/unittest2-0.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The new features in unittest for Python 2.7 backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2
- https://code.google.com/p/unittest-ext/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/unittest2-0.8.0-argparse.patch"
-)
-
-python_test() {
- "${PYTHON}" -m unittest2 discover || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-23 10:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-02 11:50 [gentoo-commits] repo/gentoo:master commit in: dev-python/unittest2/, dev-python/unittest2/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2015-11-23 10:05 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox