[gentoo-commits] repo/gentoo:master commit in: dev-python/py/, dev-python/py/files/

[Michał Górny]

commit:     38b22dbc67cb05f7da99f3c0b92b9a657360e0eb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 16:58:40 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 17:06:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b22dbc

dev-python/py: Remove redundant versions

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/py/Manifest                             |   5 -
 .../py/files/py-1.4.34-skip-broken-pytest3.patch   | 116 ---------------------
 dev-python/py/py-1.4.30.ebuild                     |  45 --------
 dev-python/py/py-1.4.34.ebuild                     |  47 ---------
 dev-python/py/py-1.5.2.ebuild                      |  47 ---------
 dev-python/py/py-1.5.3.ebuild                      |  47 ---------
 dev-python/py/py-1.5.4.ebuild                      |  48 ---------
 7 files changed, 355 deletions(-)

diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index d35ecdba49e..cad811a5f15 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,6 +1 @@
-DIST py-1.4.30.tar.gz 191796 BLAKE2B 1d908f5f29788868cb7c4da49bc8a9343176030df4549a992e06245d1d56d74ddf0477048992d282aa59e6ace1ff695a7e2c2c6f00b55f185bc91d0df8b6a6dd SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a
-DIST py-1.4.34.tar.gz 194450 BLAKE2B 3e5733bb53d4f7eb8e6d43a5140f2ddf692d4272b564a9dd4fe8ede2cb4d0296e7c8764957bf4615f5cc4272d07997d126133dfce8ac8837f01d91bf557023d2 SHA512 2e19c82c8315274bffe0ba2c7e20ae3af95f942c40c16121ec953af186f8ff33e8f427c070e137bb04b7cc6dcc6779e35df3911c08595fd3294b5ec9897706e1
-DIST py-1.5.2.tar.gz 189542 BLAKE2B f0c5995121492ebca7bab9e73b7db61edf014be8e7d76822c72ded9ea19dd647dc0a83cbbcbf732c4ddae9070126cecb00958b623ca43d2219b7be8519b5b58e SHA512 ad92110d56caba2be44c6759350b05ceb882165ad0f58e6cce8361273be874b20b01856d685b142a83edff77b41bcce2911cf5797db5253b4f3e9b36e703c07d
-DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fcde604f8fd2d36c4a03ce5955c2f445a866dd5cd83026ab2a9fa17feeb0da0df3d40d9746c19d865f6325 SHA512 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96
-DIST py-1.5.4.tar.gz 201448 BLAKE2B 3d9f71ba53c8004d4745be984e0a3b81c98f38fdcd7703c39286c53bb167a803aa92b3b0897e407f6ee98d2b870838a27b507ad8e6cceab7b22c8e7229bb6581 SHA512 45424b133be3e78ccab48e74daa6ca6a76fca283bd3a51d50c91e911c509a2c45de4fcc7c8c15f33620d61ee16dfc3969fdd78d8839e96f52897e97b1ad624c4
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b

diff --git a/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch b/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
deleted file mode 100644
index 67b1f4eb95a..00000000000
--- a/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Backport of https://github.com/pytest-dev/py/commit/3305183b964bded36f9cd43976d22524f6ae15b2
-
---- a/testing/code/test_assertion.py
-+++ b/testing/code/test_assertion.py
-@@ -141,7 +141,10 @@ def test_assert_implicit_multiline():
-         e = exvalue()
-         assert str(e).find('assert [1, 2, 3] !=') != -1
- 
--
-+@××××××××××××.xfail(py.test.__version__[0] != "2",
-+                    reason="broken on modern pytest",
-+                    run=False
-+)
- def test_assert_with_brokenrepr_arg():
-     class BrokenRepr:
-         def __repr__(self): 0 / 0
-@@ -278,7 +281,10 @@ def test_assert_raise_alias(testdir):
-     ])
- 
- 
--@×××××××××××.skipif("sys.version_info < (2,5)")
-+@××××××××××××.xfail(py.test.__version__[0] != "2",
-+                    reason="broken on modern pytest",
-+                    run=False)
-+@××××××××××××.skipif("sys.version_info < (2,5)")
- def test_assert_raise_subclass():
-     class SomeEx(AssertionError):
-         def __init__(self, *args):
---- a/testing/code/test_excinfo.py
-+++ b/testing/code/test_excinfo.py
-@@ -16,6 +16,13 @@ else:
- 
- import pytest
- pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))
-+
-+broken_on_modern_pytest = pytest.mark.xfail(
-+    pytest_version_info[0] != 2,
-+    reason="this test hasn't been fixed after moving py.code into pytest",
-+    run=False
-+    )
-+
- 
- class TWMock:
-     def __init__(self):
-@@ -355,6 +362,7 @@ class TestFormattedExcinfo:
-         assert lines[0] == "|   def f(x):"
-         assert lines[1] == "        pass"
- 
-+    @broken_on_modern_pytest
-     def test_repr_source_excinfo(self):
-         """ check if indentation is right """
-         pr = FormattedExcinfo()
-@@ -657,6 +665,7 @@ raise ValueError()
-         assert p._makepath(__file__) == __file__
-         reprtb = p.repr_traceback(excinfo)
- 
-+    @broken_on_modern_pytest
-     def test_repr_excinfo_addouterr(self, importasmod):
-         mod = importasmod("""
-             def entry():
-@@ -699,6 +708,7 @@ raise ValueError()
-             assert reprtb.extraline == "!!! Recursion detected (same locals & position)"
-             assert str(reprtb)
- 
-+    @broken_on_modern_pytest
-     def test_tb_entry_AssertionError(self, importasmod):
-         # probably this test is a bit redundant
-         # as py/magic/testing/test_assertion.py
-@@ -742,6 +752,7 @@ raise ValueError()
-         x = py.builtin._totext(MyRepr())
-         assert x == py.builtin._totext("я", "utf-8")
- 
-+    @broken_on_modern_pytest
-     def test_toterminal_long(self, importasmod):
-         mod = importasmod("""
-             def g(x):
-@@ -768,6 +779,7 @@ raise ValueError()
-         assert tw.lines[9] == ""
-         assert tw.lines[10].endswith("mod.py:3: ValueError")
- 
-+    @broken_on_modern_pytest
-     def test_toterminal_long_missing_source(self, importasmod, tmpdir):
-         mod = importasmod("""
-             def g(x):
-@@ -793,6 +805,7 @@ raise ValueError()
-         assert tw.lines[7] == ""
-         assert tw.lines[8].endswith("mod.py:3: ValueError")
- 
-+    @broken_on_modern_pytest
-     def test_toterminal_long_incomplete_source(self, importasmod, tmpdir):
-         mod = importasmod("""
-             def g(x):
-@@ -818,6 +831,7 @@ raise ValueError()
-         assert tw.lines[7] == ""
-         assert tw.lines[8].endswith("mod.py:3: ValueError")
- 
-+    @broken_on_modern_pytest
-     def test_toterminal_long_filenames(self, importasmod):
-         mod = importasmod("""
-             def f():
-@@ -863,6 +877,7 @@ raise ValueError()
-         assert tw.stringio.getvalue()
- 
- 
-+    @broken_on_modern_pytest
-     def test_native_style(self):
-         excinfo = self.excinfo_from_exec("""
-             assert 0
-@@ -877,6 +892,7 @@ raise ValueError()
-         if py.std.sys.version_info >= (2, 5):
-             assert s.count('assert 0') == 2
- 
-+    @broken_on_modern_pytest
-     def test_traceback_repr_style(self, importasmod):
-         mod = importasmod("""
-             def f():

diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
deleted file mode 100644
index 0310d4ccee1..00000000000
--- a/dev-python/py/py-1.4.30.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
deleted file mode 100644
index ef09547b505..00000000000
--- a/dev-python/py/py-1.4.34.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.34-skip-broken-pytest3.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
deleted file mode 100644
index 3f8589be8da..00000000000
--- a/dev-python/py/py-1.5.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
deleted file mode 100644
index 8506a520371..00000000000
--- a/dev-python/py/py-1.5.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
deleted file mode 100644
index 2160aec7c84..00000000000
--- a/dev-python/py/py-1.5.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}