summaryrefslogtreecommitdiff
path: root/dev-python/six
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/six')
-rw-r--r--dev-python/six/Manifest7
-rw-r--r--dev-python/six/files/1.10.0-no-setuptools.patch22
-rw-r--r--dev-python/six/six-1.10.0.ebuild66
-rw-r--r--dev-python/six/six-1.11.0.ebuild40
-rw-r--r--dev-python/six/six-1.14.0.ebuild20
5 files changed, 22 insertions, 133 deletions
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index ac994b16396c..f2e7ad57cfd6 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,11 +1,8 @@
-AUX 1.10.0-no-setuptools.patch 545 BLAKE2B e884088c94e36283ce3e9a8df716cf25b040d3c724e0ab7499c2f0c6cff5680ef04461b2a8f56e348e50c88a8f29bda053161f02e1bc5dcff36176179b0722b5 SHA512 f1d5c25815fb9e2ecfccaecef52383d468163feff0391214650f109560282ce2eff51513a60824a15ccc3a5af09fe0411b387314978af9a1f51fccc387521ffe
AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb288d87628f6a38c14a220f965430c0a480aecf0652c09155359aff9dff11449e2de3c55d7ef00f2527d3 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c
-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
-EBUILD six-1.10.0.ebuild 1808 BLAKE2B 1e879d66f425baa518b6574ced30f94d16fd6f40cadf478c0d5faedfb7c1de076142f575c6f95a50aaaeb70585f3ae938173935b5ea9e542d7262f16b2ea819e SHA512 e1ffa907c78c1f3f4524c8402c01947f95bce12f144038a37bff1610f68be29b79424187c345435983e930b363a917f806b26841981bc0b2a68b1c78f48be17d
-EBUILD six-1.11.0.ebuild 1076 BLAKE2B 60f82dac0f0dd2d410d96b709a83a599405408812a186e7739ce2935cb64990cb2002632342b081a96e53610eb9afde6eec491c5cf713706fb609a362d226ed6 SHA512 af0509c47479ce9822f7039c335d254b543a161d3b20e139d0f6d2bbf3fd51b51789e5c28fd163b5c24d14e79dccda4907ac7feff388170d35b36bc6b302ba80
+DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
EBUILD six-1.12.0.ebuild 1076 BLAKE2B b2bb88413cfab571026d7154338dec8e2f168673ce5648391c094ec4065c86994420f79f43777f4428cf77a5e7d6fa905ea954e9d9113dccdc898fdec3e502c4 SHA512 9d3f4460cc9724bcb25a15c08d842fb7756b9e9469984934da105efb906681dd00da57995f4e3e2364bdbbd86c701cc3803f1bdf0d565d08057748680dbeaf7b
EBUILD six-1.13.0.ebuild 965 BLAKE2B b17cced2a16ca0172e4895df375638e24f22d920c191eb4af89680f522da2e09eb6ffe03cbc007a8f065c86a1133f2afb2212a4d0f618e97019802455a483269 SHA512 79178727a2f1b4dfa42d90f6cbb53693a8ee176550956638339cf723447710ff3017fee46a214832f029151ee45f2a4ac67d90a4fb3cb22a0ddf4411f1e04c93
+EBUILD six-1.14.0.ebuild 689 BLAKE2B 4335b911f57b5c84894f26e97e329919d82d17cccd7547a646f603b2fb56beb304c8019388a62ae700bdc55ebbc78422cd8309dec992b69fccf53835b9aed812 SHA512 76e1a6398ee5dcc1971a6d101860a83d4c14af2ced60b34602fc2e1753ec7429fefab944a36f7cd2dbed74de7943461f94ec30f24bb9a939ed769bc0a102aaa2
MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
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 d4309181902a..000000000000
--- 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 97b6b912bdb7..000000000000
--- 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 b8c67bbc0b26..000000000000
--- 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
-}
diff --git a/dev-python/six/six-1.14.0.ebuild b/dev-python/six/six-1.14.0.ebuild
new file mode 100644
index 000000000000..5b72b414e38a
--- /dev/null
+++ b/dev-python/six/six-1.14.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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"
+
+distutils_enable_sphinx documentation
+distutils_enable_tests pytest