commit: d9d4935d42ee4ea354177ee45e75cf0d66a24ce8 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jan 16 04:30:32 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jan 16 04:30:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d4935d
dev-python/six: Remove redundant versions Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/six/Manifest | 2 - dev-python/six/files/1.10.0-no-setuptools.patch | 22 --------- dev-python/six/six-1.10.0.ebuild | 66 ------------------------- dev-python/six/six-1.11.0.ebuild | 40 --------------- 4 files changed, 130 deletions(-) diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest index dd03873b4a7..3459d910c0e 100644 --- a/dev-python/six/Manifest +++ b/dev-python/six/Manifest @@ -1,5 +1,3 @@ -DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e -DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24 DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151 DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00 DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e diff --git a/dev-python/six/files/1.10.0-no-setuptools.patch b/dev-python/six/files/1.10.0-no-setuptools.patch deleted file mode 100644 index d4309181902..00000000000 --- a/dev-python/six/files/1.10.0-no-setuptools.patch +++ /dev/null @@ -1,22 +0,0 @@ -Force distutils to avoid depending on setuptools - -distutils and setuptools have differing behavior in regard to egg-info -directories versus files, so we need to ensure that no automagic behavior -occurs here. - -We cannot hard-depend on setuptools due to a circular dependency. - -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -1,9 +1,6 @@ - from __future__ import with_statement - --try: -- from setuptools import setup --except ImportError: -- from distutils.core import setup -+from distutils.core import setup - - import six - diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild deleted file mode 100644 index 97b6b912bdb..00000000000 --- a/dev-python/six/six-1.10.0.ebuild +++ /dev/null @@ -1,66 +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="Python 2 and 3 compatibility library" -HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"; -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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -DEPEND=" - doc? ( dev-python/sphinx ) - test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/1.10.0-no-setuptools.patch - "${FILESDIR}"/1.9.0-mapping.patch -) - -python_prepare_all() { - # https://bitbucket.org/gutworth/six/issues/139/ - sed \ - -e 's:test_assertCountEqual:_&:g' \ - -e 's:test_assertRegex:_&:g' \ - -e 's:test_assertRaisesRegex:_&:g' \ - -i test_six.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C documentation html -} - -python_test() { - py.test -v || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( documentation/_build/html/ ) - distutils-r1_python_install_all -} - -# Remove pkg_preinst in the next version bump -pkg_preinst() { - # https://bugs.gentoo.org/585146 - cd "${HOME}" || die - - _cleanup() { - local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())") - local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" - if [[ -d ${egginfo} ]]; then - echo rm -r "${egginfo}" - rm -r "${egginfo}" || die "Failed to remove egg-info directory" - fi - } - python_foreach_impl _cleanup -} diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild deleted file mode 100644 index b8c67bbc0b2..00000000000 --- a/dev-python/six/six-1.11.0.ebuild +++ /dev/null @@ -1,40 +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="Python 2 and 3 compatibility library" -HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"; -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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx ) - test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/1.9.0-mapping.patch -) - -python_compile_all() { - use doc && emake -C documentation html -} - -python_test() { - py.test -v || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( documentation/_build/html/. ) - distutils-r1_python_install_all -}
