From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-python/nose/Manifest | 8 ++ .../files/nose-1.3.7-coverage-4.1-support.patch | 20 +++++ .../files/nose-1.3.7-python-3.5-backport.patch | 54 ++++++++++++ .../nose/files/nose-1.3.7-python-3.6-test.patch | 67 +++++++++++++++ dev-python/nose/metadata.xml | 13 +++ dev-python/nose/nose-1.3.7-r1.ebuild | 87 +++++++++++++++++++ dev-python/nose/nose-1.3.7-r3.ebuild | 97 ++++++++++++++++++++++ dev-python/nose/nose-9999.ebuild | 86 +++++++++++++++++++ 8 files changed, 432 insertions(+) create mode 100644 dev-python/nose/Manifest create mode 100644 dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch create mode 100644 dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch create mode 100644 dev-python/nose/files/nose-1.3.7-python-3.6-test.patch create mode 100644 dev-python/nose/metadata.xml create mode 100644 dev-python/nose/nose-1.3.7-r1.ebuild create mode 100644 dev-python/nose/nose-1.3.7-r3.ebuild create mode 100644 dev-python/nose/nose-9999.ebuild (limited to 'dev-python/nose') diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest new file mode 100644 index 000000000000..5c8826c42911 --- /dev/null +++ b/dev-python/nose/Manifest @@ -0,0 +1,8 @@ +AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb25300fee4430d3c4f42e560eaffdb208b672246fa2a9bce828f57fce36c32f03b329f9e0fcbea6d3b0fd1aef6605567c763fcfc80e SHA512 2d1512ca1f0572e4ffb17ac4b964e391ed9c5b5bdb78eac7a1710d51804f8c33c6ffbeb9b85565dc2d4162c5a912c864f15c7857e85cb294c1e0712ae540e983 +AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2 +AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127 +DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62 +EBUILD nose-1.3.7-r1.ebuild 2470 BLAKE2B fa467c94ff2c2a656d6c44cb90f4741feabeb146e46fe93657ba6d12258fae1f68d0d0f5130bc04a2ceadca42c3c7efacaa40dd8356239cc495c9477a44155c4 SHA512 651f41e8f6fc187365d768b90ec6419e5ca76510eb74075feef9bc30ecf7a8cf7cdcc40ede65bda7b8241760ef1c706f4c9a6f2dee25d75cff13107e300d0bbf +EBUILD nose-1.3.7-r3.ebuild 2775 BLAKE2B d729bfe30ad056a39ee79dac8b2f7a8294c708d65c952008f1bf78256d2f91f8ea39067ede85e1b8565361cc4ba302dae905f4d2d6427395d5fce9f357ec1376 SHA512 803b7d3b4b2a801ce5ea9f96e4fabd26f5a503577be141b523a9a89b1017c49489ef605fa0557cc6aa70879cecb0e73b8c24320e6d24afee5c065d657f16f624 +EBUILD nose-9999.ebuild 2234 BLAKE2B 098036df8fa1c951ccd5936f411c1b9d9334cc2dc9713bd7450cca44b1f35f225111d663481697db34a4f36ca6ad5d13740d020afb7852d168c77e84eaa295df SHA512 77b669442f6589d63af0c3927e4e6c120667d42717fcff6b835de1abd46a26415e622f265b17bb64da0381bd2c49bf9c9bd0443b0d83ea61ee2f01d942599f6f +MISC metadata.xml 432 BLAKE2B d2e71400e1d6c6fd0f03ffe106d6c5c7e6ee4b657a2958b4dcc8749fc475bed1b0f44279a557b27451ef5fb31363bac7c5cf5d6433c1ac1901eace3a66bfd826 SHA512 d4ff137034358979e2b59fa11e18ff17ade90c1c2127f5c769a58c8867a5de1a4736c2d22cad063b9119067578feb6401305f6acfd3e05d897b3f01f273e5530 diff --git a/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch b/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch new file mode 100644 index 000000000000..87577871b613 --- /dev/null +++ b/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch @@ -0,0 +1,20 @@ +--- a/nose/plugins/cover.py 2016-10-11 15:51:26.990868010 +0200 ++++ b/nose/plugins/cover.py 2016-10-11 15:52:28.261102027 +0200 +@@ -187,7 +187,7 @@ + for name, module in sys.modules.items() + if self.wantModuleCoverage(name, module)] + log.debug("Coverage report will cover modules: %s", modules) +- self.coverInstance.report(modules, file=stream) ++ self.coverInstance.report(modules, file=stream, show_missing=True) + + import coverage + if self.coverHtmlDir: +@@ -207,7 +207,7 @@ + # make sure we have minimum required coverage + if self.coverMinPercentage: + f = StringIO.StringIO() +- self.coverInstance.report(modules, file=f) ++ self.coverInstance.report(modules, file=f, show_missing=True) + + multiPackageRe = (r'-------\s\w+\s+\d+\s+\d+(?:\s+\d+\s+\d+)?' + r'\s+(\d+)%\s+\d*\s{0,1}$') diff --git a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch new file mode 100644 index 000000000000..8d2f2f05dc29 --- /dev/null +++ b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch @@ -0,0 +1,54 @@ +From 8e7ad3d50012688ca029d126cbc88251831fea88 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Mon, 1 Feb 2016 00:05:30 +0300 +Subject: [PATCH 1/2] Set __qualname__ equal to __name__ on derived classes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To make output on Python ≥ 3.5 the same as on previous Python versions. + +This fixes #928. +--- + functional_tests/test_load_tests_from_test_case.py | 1 + + nose/util.py | 1 + + unit_tests/test_xunit.py | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py +index 42f8563..13d0c8a 100644 +--- a/functional_tests/test_load_tests_from_test_case.py ++++ b/functional_tests/test_load_tests_from_test_case.py +@@ -29,6 +29,7 @@ def setUp(self): + pass + def tearDown(self): + pass ++ Derived.__qualname__ = Derived.__name__ + # must use nose loader here because the default loader in 2.3 + # won't load tests from base classes + l = loader.TestLoader() +diff --git a/nose/util.py b/nose/util.py +index bfe1658..80ab1d4 100644 +--- a/nose/util.py ++++ b/nose/util.py +@@ -643,6 +643,7 @@ class C(cls): + pass + C.__module__ = module + C.__name__ = cls.__name__ ++ C.__qualname__ = cls.__name__ + return C + + +diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py +index 944d285..261436b 100644 +--- a/unit_tests/test_xunit.py ++++ b/unit_tests/test_xunit.py +@@ -16,6 +16,7 @@ def mktest(): + class TC(unittest.TestCase): + def runTest(self): + pass ++ TC.__qualname__ = TC.__name__ + test = TC() + return test + + diff --git a/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch b/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch new file mode 100644 index 000000000000..eda10ff036cf --- /dev/null +++ b/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch @@ -0,0 +1,67 @@ +From 84bb82245d10798825439dc13846eb0538d84239 Mon Sep 17 00:00:00 2001 +From: Tomas Orsava +Date: Mon, 12 Dec 2016 14:35:50 +0100 +Subject: [PATCH] Fix compatibility with Python 3.6 + +Python 3.6 returns ModuleNotFoundError instead of the previous ImportError. +https://github.com/nose-devs/nose/pull/1029 +--- + functional_tests/test_loader.py | 2 +- + functional_tests/test_withid_failures.rst | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py +index 104f220..906e2ba 100644 +--- a/functional_tests/test_loader.py ++++ b/functional_tests/test_loader.py +@@ -372,7 +372,7 @@ def test_failed_import_module_name(self): + assert res.errors, "Expected errors but got none" + assert not res.failures, res.failures + err = res.errors[0][0].test.exc_class +- assert err is ImportError, \ ++ assert issubclass(err, ImportError), \ + "Expected import error, got %s" % err + + def test_load_nonsense_name(self): +diff --git a/functional_tests/test_withid_failures.rst b/functional_tests/test_withid_failures.rst +index cf09d4f..cb20886 100644 +--- a/functional_tests/test_withid_failures.rst ++++ b/functional_tests/test_withid_failures.rst +@@ -7,16 +7,16 @@ + >>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails') + >>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support] + >>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS +- #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR ++ #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR + #2 test_b.test ... ok + #3 test_b.test_fail ... FAIL + + ====================================================================== +- ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...) ++ ERROR: Failure: ... (No module ...apackagethatdoesntexist...) + ---------------------------------------------------------------------- + Traceback (most recent call last): + ... +- ImportError: No module ...apackagethatdoesntexist... ++ ...: No module ...apackagethatdoesntexist... + + ====================================================================== + FAIL: test_b.test_fail +@@ -35,14 +35,14 @@ Addressing failures works (sometimes). + >>> argv.append('1') + >>> _junk = sys.modules.pop('test_a', None) # 2.3 requires + >>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS +- #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR ++ #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR + + ====================================================================== +- ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...) ++ ERROR: Failure: ... (No module ...apackagethatdoesntexist...) + ---------------------------------------------------------------------- + Traceback (most recent call last): + ... +- ImportError: No module ...apackagethatdoesntexist... ++ ...: No module ...apackagethatdoesntexist... + + ---------------------------------------------------------------------- + Ran 1 test in ...s diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml new file mode 100644 index 000000000000..1b59d602e352 --- /dev/null +++ b/dev-python/nose/metadata.xml @@ -0,0 +1,13 @@ + + + + + python@gentoo.org + Python + + + nose + nose-devs/nose + jpellerin/nose + + diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild new file mode 100644 index 000000000000..98650c11bb11 --- /dev/null +++ b/dev-python/nose/nose-1.3.7-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring" +HOMEPAGE=" + https://pypi.org/project/nose/ + https://nose.readthedocs.io/en/latest/ + https://bitbucket.org/jpellerin/nose" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples test" + +REQUIRED_USE=" + doc? ( || ( $(python_gen_useflags 'python2*') ) )" + +RDEPEND=" + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) + test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )" + +PATCHES=( "${FILESDIR}"/${P}-python-3.5-backport.patch ) + +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + +python_prepare_all() { + # Tests need to be converted, and they don't respect BUILD_DIR. + use test && DISTUTILS_IN_SOURCE_BUILD=1 + + # Disable tests requiring network connection. + sed \ + -e "s/test_resolve/_&/g" \ + -e "s/test_raises_bad_return/_&/g" \ + -e "s/test_raises_twisted_error/_&/g" \ + -i unit_tests/test_twisted.py || die "sed failed" + # Disable versioning of nosetests script to avoid collision with + # versioning performed by the eclass. + sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \ + -i setup.py || die "sed2 failed" + + # Prevent un-needed d'loading during doc build + sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + local add_targets=() + + if use test; then + add_targets+=( egg_info ) + python_is_python3 && add_targets+=( build_tests ) + fi + + distutils-r1_python_compile ${add_targets[@]} +} + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install --install-data "${EPREFIX}/usr/share" +} + +python_install_all() { + use examples && dodoc -r examples + use doc && HTML_DOCS=( doc/.build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild new file mode 100644 index 000000000000..130b3d368d81 --- /dev/null +++ b/dev-python/nose/nose-1.3.7-r3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring" +HOMEPAGE=" + https://pypi.org/project/nose/ + https://nose.readthedocs.io/en/latest/ + https://bitbucket.org/jpellerin/nose" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples test" + +REQUIRED_USE=" + doc? ( || ( $(python_gen_useflags 'python2*') ) )" + +RDEPEND=" + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) + test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) + $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) + ) )" + +PATCHES=( + "${FILESDIR}"/${P}-python-3.5-backport.patch + + # Patch against master found in an upstream PR, backported: + # https://github.com/nose-devs/nose/pull/1004 + "${FILESDIR}"/${P}-coverage-4.1-support.patch + + "${FILESDIR}"/${P}-python-3.6-test.patch +) + +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + +python_prepare_all() { + # Tests need to be converted, and they don't respect BUILD_DIR. + use test && DISTUTILS_IN_SOURCE_BUILD=1 + + # Disable tests requiring network connection. + sed \ + -e "s/test_resolve/_&/g" \ + -e "s/test_raises_bad_return/_&/g" \ + -e "s/test_raises_twisted_error/_&/g" \ + -i unit_tests/test_twisted.py || die "sed failed" + # Disable versioning of nosetests script to avoid collision with + # versioning performed by the eclass. + sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \ + -i setup.py || die "sed2 failed" + + # Prevent un-needed d'loading during doc build + sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + local add_targets=() + + if use test; then + add_targets+=( egg_info ) + python_is_python3 && add_targets+=( build_tests ) + fi + + distutils-r1_python_compile ${add_targets[@]} +} + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install --install-data "${EPREFIX}/usr/share" +} + +python_install_all() { + use examples && dodoc -r examples + use doc && HTML_DOCS=( doc/.build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild new file mode 100644 index 000000000000..d3f5375f2559 --- /dev/null +++ b/dev-python/nose/nose-9999.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 git-r3 + +DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring" +HOMEPAGE=" + https://pypi.org/project/nose/ + https://nose.readthedocs.io/en/latest/ + https://github.com/nose-devs/nose" +SRC_URI="" +EGIT_REPO_URI="https://github.com/nose-devs/${PN}.git" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="" +IUSE="doc examples test" + +REQUIRED_USE=" + doc? ( || ( $(python_gen_useflags 'python2*') ) )" + +RDEPEND=" + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) + test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) )" + +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + +python_prepare_all() { + # Tests need to be converted, and they don't respect BUILD_DIR. + use test && DISTUTILS_IN_SOURCE_BUILD=1 + + # Disable tests requiring network connection. + sed \ + -e "s/test_resolve/_&/g" \ + -e "s/test_raises_bad_return/_&/g" \ + -e "s/test_raises_twisted_error/_&/g" \ + -i unit_tests/test_twisted.py || die "sed failed" + # Disable versioning of nosetests script to avoid collision with + # versioning performed by the eclass. + sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \ + -i setup.py || die "sed2 failed" + + # Prevent un-needed d'loading during doc build + sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + local add_targets=() + + if use test; then + add_targets+=( egg_info ) + python_is_python3 && add_targets+=( build_tests ) + fi + + distutils-r1_python_compile ${add_targets[@]} +} + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install --install-data "${EPREFIX}/usr/share" +} + +python_install_all() { + use examples && dodoc -r examples + use doc && HTML_DOCS=( doc/.build/html/. ) + distutils-r1_python_install_all +} -- cgit v1.2.3