diff options
Diffstat (limited to 'dev-python/jaraco-functools')
8 files changed, 118 insertions, 234 deletions
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest index 21e02291b87b..0c8e216ae791 100644 --- a/dev-python/jaraco-functools/Manifest +++ b/dev-python/jaraco-functools/Manifest @@ -1,3 +1,2 @@ -DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb7933961ba5e50091439c274bd8ceeda68b69789423994fe43f44af6cdd643b7a04418bc32ce2f937d118520298a019c5c6638 SHA512 7fbf1956ff8a132021e1f7fae5e98f40199a5d0e705b08b44ad5b2588fdd7d1088db9d7457b985c1852b50285a8f03cc9795fff0c4f53f9155f7c8ec371ff307 -DIST jaraco.functools-2.0.tar.gz 14340 BLAKE2B 560490b1150c2385f9c4d468fe7ab4fa84475ad43e1ebed784343a71742976ed0c18df3f6240b1d5b69106a6835c0248838331a654f9d3fdc863622c3dda33be SHA512 dce30c08f0e9f3c7b682c78fc3a46a26d9972706f4c8449a12ba11aa5ed130c6d9ca405213fd93b6b4110ef9cea549e5fa925c96bfaf18681cd6957d8ba0889f -DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5 +DIST jaraco.functools-4.0.0.tar.gz 17779 BLAKE2B ef403411f60e956a723350c949cdbd13fa36473ce77f6b1cea4eb5eaedbd2edd4ea902b8c062d53411c7bc12dcfd3879b0f1c82a1d21c28575f0298eb03f868d SHA512 2545bf3b9c9357ae867e7a5627582e14d0bdf25bac6acc5fbbb7e86f7aa24bc33b5bca584543b4180abdde203610b9716950110253045c1fe11f8bd045283c78 +DIST jaraco_functools-4.0.1.tar.gz 18169 BLAKE2B 86d5b8020f9c44b8dc373fd2f07a8c5f11cb2a7ec069541763ce92562fb230b557a4c3783e899713136c71e457985bc7e4abb0becde9ca7eaacf7798b5815269 SHA512 04e0ea4719ec8c4439e5a1dd3c3ba0241b21b54b06d53ecc44263046e994aa736b9d196490edd3fd9d7ea997c23c177b30db506b2088bd9de62c637856101982 diff --git a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch b/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch deleted file mode 100644 index dc296c4eb47c..000000000000 --- a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cc972095e5aa2ae80d1d69d7ca84ee94178e869a Mon Sep 17 00:00:00 2001 -From: "Jason R. Coombs" <jaraco@jaraco.com> -Date: Sat, 20 Apr 2019 07:08:41 -0400 -Subject: [PATCH] Rewrite docstring on Python 3.7.3 to allow the test to pass. - Fixes #12. - ---- - conftest.py | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - create mode 100644 conftest.py - -diff --git a/conftest.py b/conftest.py -new file mode 100644 -index 0000000..b6fad41 ---- /dev/null -+++ b/conftest.py -@@ -0,0 +1,24 @@ -+import sys -+import re -+ -+import jaraco.functools -+ -+ -+def pytest_configure(): -+ patch_for_issue_12() -+ -+ -+def patch_for_issue_12(): -+ """ -+ Issue #12 revealed that Python 3.7.3 had a subtle -+ change in the C implementation of functools that -+ broke the assumptions around the method_cache (or -+ any caller using possibly empty keyword arguments). -+ This patch adjusts the docstring for that test so it -+ can pass on that Python version. -+ """ -+ affected_ver = 3, 7, 3 -+ if sys.version_info[:3] != affected_ver: -+ return -+ mc = jaraco.functools.method_cache -+ mc.__doc__ = re.sub(r'^(\s+)75', r'\g<1>76', mc.__doc__, flags=re.M) diff --git a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild deleted file mode 100644 index 99f489e89c43..000000000000 --- a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python{2_7,3_6} ) - -inherit distutils-r1 - -MY_PN="${PN/-/.}" -DESCRIPTION="Additional functions used by other projects by developer jaraco" -HOMEPAGE="https://github.com/jaraco/jaraco.functools" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - <dev-python/namespace-jaraco-2[${PYTHON_USEDEP}] - dev-python/more-itertools[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7) -" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] - doc? ( - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ) - test? ( - ${RDEPEND} - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - dev-python/backports-unittest-mock[${PYTHON_USEDEP}] - dev-python/jaraco-classes[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_compile_all() { - if use doc; then - cd docs || die - sphinx-build . _build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - -python_test() { - # Override pytest options to skip flake8 - PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \ - || die "tests failed with ${EPYTHON}" - } - -python_install_all() { - distutils-r1_python_install_all - find "${ED}" -name '*.pth' -delete || die -} diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild deleted file mode 100644 index d40b39eb77b0..000000000000 --- a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} ) - -inherit distutils-r1 - -MY_PN="${PN/-/.}" -DESCRIPTION="Additional functions used by other projects by developer jaraco" -HOMEPAGE="https://github.com/jaraco/jaraco.functools" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}] - dev-python/more-itertools[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7) -" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - dev-python/backports-unittest-mock[${PYTHON_USEDEP}] - dev-python/jaraco-classes[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" - -PATCHES=( "${FILESDIR}/${P}-fix-py37-tests.patch" ) - -distutils_enable_sphinx docs \ - ">=dev-python/jaraco-packaging-3.2" \ - ">=dev-python/rst-linker-1.9" - -python_prepare_all() { - # avoid a setuptools_scm dependency - sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die - sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ - setup.cfg || die - - distutils-r1_python_prepare_all -} - -python_test() { - # Override pytest options to skip flake8 - PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \ - || die "tests failed with ${EPYTHON}" -} - -# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages -python_install() { - rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die - # note: eclass may default to --skip-build in the future - distutils-r1_python_install --skip-build -} diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild deleted file mode 100644 index 24d012e5188a..000000000000 --- a/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{6,7,8} ) - -inherit distutils-r1 - -MY_PN="${PN/-/.}" -DESCRIPTION="Additional functions used by other projects by developer jaraco" -HOMEPAGE="https://github.com/jaraco/jaraco.functools" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}] - dev-python/more-itertools[${PYTHON_USEDEP}] -" -# TODO: remove six -# https://github.com/jaraco/jaraco.functools/pull/14 -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - dev-python/jaraco-classes[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs \ - ">=dev-python/jaraco-packaging-3.2" \ - ">=dev-python/rst-linker-1.9" - -python_prepare_all() { - # avoid a setuptools_scm dependency - sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die - sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ - setup.cfg || die - - distutils-r1_python_prepare_all -} - -python_test() { - # Override pytest options to skip flake8 - PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \ - || die "tests failed with ${EPYTHON}" -} - -# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages -python_install() { - rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die - # note: eclass may default to --skip-build in the future - distutils-r1_python_install --skip-build -} diff --git a/dev-python/jaraco-functools/jaraco-functools-4.0.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-4.0.0.ebuild new file mode 100644 index 000000000000..56f61ce83156 --- /dev/null +++ b/dev-python/jaraco-functools/jaraco-functools-4.0.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 8 -- sys-apps/portage dep +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYPI_NO_NORMALIZE=1 +PYPI_PN=${PN/-/.} +PYTHON_COMPAT=( pypy3 python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Additional functions used by other projects by developer jaraco" +HOMEPAGE=" + https://github.com/jaraco/jaraco.functools/ + https://pypi.org/project/jaraco.functools/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/jaraco-classes[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_configure() { + grep -q 'build-backend = "setuptools' pyproject.toml || + die "Upstream changed build-backend, recheck" + # write a custom pyproject.toml to ease setuptools bootstrap + cat > pyproject.toml <<-EOF || die + [build-system] + requires = ["flit_core >=3.2,<4"] + build-backend = "flit_core.buildapi" + + [project] + name = "jaraco.functools" + version = "${PV}" + description = "Functools like those found in stdlib" + EOF +} + +python_install() { + distutils-r1_python_install + # rename to workaround a bug in pkg_resources + # https://bugs.gentoo.org/834522 + mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die +} diff --git a/dev-python/jaraco-functools/jaraco-functools-4.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-4.0.1.ebuild new file mode 100644 index 000000000000..5d3cc9f68a82 --- /dev/null +++ b/dev-python/jaraco-functools/jaraco-functools-4.0.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 8 -- sys-apps/portage dep +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYPI_PN=${PN/-/.} +PYTHON_COMPAT=( pypy3 python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Additional functions used by other projects by developer jaraco" +HOMEPAGE=" + https://github.com/jaraco/jaraco.functools/ + https://pypi.org/project/jaraco.functools/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/jaraco-classes[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_configure() { + grep -q 'build-backend = "setuptools' pyproject.toml || + die "Upstream changed build-backend, recheck" + # write a custom pyproject.toml to ease setuptools bootstrap + cat > pyproject.toml <<-EOF || die + [build-system] + requires = ["flit_core >=3.2,<4"] + build-backend = "flit_core.buildapi" + + [project] + name = "jaraco.functools" + version = "${PV}" + description = "Functools like those found in stdlib" + EOF +} + +python_install() { + distutils-r1_python_install + # rename to workaround a bug in pkg_resources + # https://bugs.gentoo.org/834522 + mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die +} diff --git a/dev-python/jaraco-functools/metadata.xml b/dev-python/jaraco-functools/metadata.xml index 69d8fbca232b..27794568db97 100644 --- a/dev-python/jaraco-functools/metadata.xml +++ b/dev-python/jaraco-functools/metadata.xml @@ -1,14 +1,14 @@ <?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="person"> - <email>sbraz@gentoo.org</email> - <name>Louis Sautier</name> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">jaraco.functools</remote-id> <remote-id type="github">jaraco/jaraco.functools</remote-id> <bugs-to>https://github.com/jaraco/jaraco.functools/issues</bugs-to> - <changelog>https://github.com/jaraco/jaraco.functools/blob/master/CHANGES.rst</changelog> </upstream> </pkgmetadata> |