dev-python/six: Sync with gentoo

It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a.
This commit is contained in:
Krzesimir Nowak 2021-11-17 21:09:23 +01:00
parent 5d278ee374
commit 263ec56bba
7 changed files with 32 additions and 129 deletions

View File

@ -1 +1 @@
DIST six-1.10.0.tar.gz 29630 SHA256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e WHIRLPOOL aad2fc7438b0df029bf477a783161dc169795c355be1281f1fe7aa4eb959eae5abf3bc96d097a221e0e5ad0b0494c29025bbe99bc28ff0c29ae1776e8691a70a
DIST six-1.16.0.tar.gz 34041 BLAKE2B 764f8da9a0d89e95af002c79c2b19e852fdec9a6819655c57be019b48bd65a5f7909473e71887e6080073f381f983c077487591d4e44297542cf6b9a29ba42b8 SHA512 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0

View File

@ -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

View File

@ -1,12 +0,0 @@
Patch prevents downloading non essential .inv files during the doc build
diff -ur six-1.5.2.orig/documentation/conf.py six-1.5.2/documentation/conf.py
--- documentation/conf.py 2013-09-15 21:52:34.000000000 +0800
+++ documentation/conf.py 2014-01-07 18:19:24.958916446 +0800
@@ -211,7 +211,3 @@
[u"Benjamin Peterson"], 1)
]
-# -- Intersphinx ---------------------------------------------------------------
-
-intersphinx_mapping = {"py2" : ("https://docs.python.org/2/", None),
- "py3" : ("https://docs.python.org/3/", None)}

View File

@ -1,27 +0,0 @@
# HG changeset patch
# User Benjamin Peterson <benjamin@python.org>
# Date 1426865725 18000
# Node ID c996ed1dc0064f45e691f1664d06001ae07fff00
# Parent 7638872a6c760448ed8648d692c8eb702a29c361
# Parent 24dc6a6f7384712152dd1e881c115fb4805be9ea
Merged in mrossini/six (pull request #55)
_winreg is added to the moves module under windows only
diff --git a/six.py b/six.py
--- a/six.py
+++ b/six.py
@@ -298,8 +298,12 @@
MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
- MovedModule("winreg", "_winreg"),
]
+#Add windows specific modules if needed
+if sys.platform in ('win32', 'cygwin'):
+ _moved_attributes += [
+ MovedModule("winreg", "_winreg"),
+ ]
for attr in _moved_attributes:
setattr(_MovedItems, attr.name, attr)
if isinstance(attr, MovedModule):

View File

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">six</remote-id>
<remote-id type="bitbucket">gutworth/six</remote-id>
<remote-id type="github">benjaminp/six</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,65 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python 2 and 3 compatibility library"
HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc 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
}

View File

@ -0,0 +1,28 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7..10} 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_sphinx documentation --no-autodoc
distutils_enable_tests pytest
python_test() {
local deselect=()
[[ ${EPYTHON} == pypy3 ]] && deselect+=(
'test_six.py::test_move_items[dbm_ndbm]'
)
epytest ${deselect[@]/#/--deselect }
}