From 0dec450a90c7490f11df7e69cd9c6709c099285c Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 13 Mar 2020 10:26:35 +0100 Subject: Move dev-python/{git-python → GitPython} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use upstream package name, especially that there is another package called 'git-python' on PyPI. Signed-off-by: Michał Górny --- dev-python/GitPython/GitPython-2.1.11.ebuild | 37 ++++++++++++++ dev-python/GitPython/GitPython-3.1.0.ebuild | 59 ++++++++++++++++++++++ dev-python/GitPython/Manifest | 5 ++ dev-python/GitPython/metadata.xml | 12 +++++ dev-python/bandit/bandit-1.5.1-r1.ebuild | 2 +- dev-python/bandit/bandit-1.6.2.ebuild | 2 +- dev-python/git-python/Manifest | 5 -- dev-python/git-python/git-python-2.1.11.ebuild | 37 -------------- dev-python/git-python/git-python-3.1.0.ebuild | 59 ---------------------- dev-python/git-python/metadata.xml | 12 ----- dev-util/gertty/gertty-1.6.0-r1.ebuild | 2 +- dev-util/gertty/gertty-9999.ebuild | 2 +- profiles/updates/1Q-2020 | 1 + .../elivepatch-client/elivepatch-client-0.1.ebuild | 2 +- .../elivepatch-client-9999.ebuild | 2 +- 15 files changed, 120 insertions(+), 119 deletions(-) create mode 100644 dev-python/GitPython/GitPython-2.1.11.ebuild create mode 100644 dev-python/GitPython/GitPython-3.1.0.ebuild create mode 100644 dev-python/GitPython/Manifest create mode 100644 dev-python/GitPython/metadata.xml delete mode 100644 dev-python/git-python/Manifest delete mode 100644 dev-python/git-python/git-python-2.1.11.ebuild delete mode 100644 dev-python/git-python/git-python-3.1.0.ebuild delete mode 100644 dev-python/git-python/metadata.xml diff --git a/dev-python/GitPython/GitPython-2.1.11.ebuild b/dev-python/GitPython/GitPython-2.1.11.ebuild new file mode 100644 index 000000000000..c995e67a79ea --- /dev/null +++ b/dev-python/GitPython/GitPython-2.1.11.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +MY_PN="GitPython" +MY_PV="${PV/_rc/.RC}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Library used to interact with Git repositories" +HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux" +IUSE="test" + +# Tests only work with the GitPython repo +RESTRICT="test" + +RDEPEND=" + dev-vcs/git + >=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + >=dev-python/ddt-1.1.1[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + )" + +S="${WORKDIR}/${MY_P}" diff --git a/dev-python/GitPython/GitPython-3.1.0.ebuild b/dev-python/GitPython/GitPython-3.1.0.ebuild new file mode 100644 index 000000000000..586d0abb46de --- /dev/null +++ b/dev-python/GitPython/GitPython-3.1.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +MY_PN=GitPython +MY_P=${MY_PN}-${PV} +GITDB_P=gitdb-4.0.2 +SMMAP_P=smmap-3.0.1 + +DESCRIPTION="Library used to interact with Git repositories" +HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/" +SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz + test? ( + https://dev.gentoo.org/~mgorny/dist/${MY_P}.gitbundle + https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle + https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle + )" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-vcs/git + >=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( + >=dev-python/ddt-1.1.1[${PYTHON_USEDEP}] + )" + +distutils_enable_tests unittest + +src_test() { + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + + git clone "${DISTDIR}/${MY_P}.gitbundle" "${T}"/test || die + git clone "${DISTDIR}/${GITDB_P}.gitbundle" \ + "${T}"/test/git/ext/gitdb || die + git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \ + "${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die + + cd "${T}"/test || die + # remove performance tests + rm -r git/test/performance || die + # tests requiring network access + sed -i -e 's:test_fetch_error:_&:' git/test/test_remote.py || die + # broken apparently + sed -i -e 's:test_rev_parse:_&:' git/test/test_repo.py || die + + distutils-r1_src_test +} diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest new file mode 100644 index 000000000000..ea18deb602d6 --- /dev/null +++ b/dev-python/GitPython/Manifest @@ -0,0 +1,5 @@ +DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f +DIST GitPython-3.1.0.gitbundle 8618276 BLAKE2B a1ecf49c47804b399453c6931fb54903309944b47a5a8ccd02d62f4b27943e60b4b58a9e67567008fa4d5bc791b1c86642659c045c885e2155e2c44bb1a4ea81 SHA512 a71463f861f840d3169a8351155665243d9f0f0a72e210940f9f7872cfd49b6ddfac827f0ec5bc61079d8066fc7ba210a03dd99f3bbd598e22ccbcacfe8e61b3 +DIST GitPython-3.1.0.tar.gz 430079 BLAKE2B eaf4d4bb2f589a96bcdcf28e7ac6c0b8eab691a1dee5fbbec6d4a93bab9f123b07073af8a1b85aa5547057e46e6c8c004215167790b559f3848bf20c3ec1697f SHA512 6dab8449cc1736d7f58f9788b56bf63cc2bf0f420104d6e010a9624d21f53f5b5d33135bad4d91b40d9543b454be839f8003828ffe512c35a6513c27a2dd4b53 +DIST gitdb-4.0.2.gitbundle 1474197 BLAKE2B 93dc8aeb3a43f0950bec1e8dc0c0156543a0a1ce1f20a7f0b2cd05c110338af05b6c6300c3f4b2c05e0f895496248e5fdca74eb599a4ea9aa983ed399d91f7c6 SHA512 8d4ebc93d6869a60b7717fc090000067e86a7e0373c281d0fb9939a6e2e283864256f827919eeb13be977254c0c71a4864d8e7c9b4b6dcc0af6275aa59681960 +DIST smmap-3.0.1.gitbundle 263781 BLAKE2B 6e06586010814ce0f59367c7f9289dad4891ee1debbc020b192af3945207da05b1e34907f1871f5b6b9638706b9e2fdacf390fcfff6bd06af84b9fd80f7e63a8 SHA512 c2b6c0b295c2997ed53727d3d1458ae7ec5ddbde9c83349286904726865fc026a70161955498b1a06371fb8d937e7386b80b4ea0c2e5d1c647718e6dbea93104 diff --git a/dev-python/GitPython/metadata.xml b/dev-python/GitPython/metadata.xml new file mode 100644 index 000000000000..7e626312fece --- /dev/null +++ b/dev-python/GitPython/metadata.xml @@ -0,0 +1,12 @@ + + + + + python@gentoo.org + Python + + + GitPython + gitpython-developers/GitPython + + diff --git a/dev-python/bandit/bandit-1.5.1-r1.ebuild b/dev-python/bandit/bandit-1.5.1-r1.ebuild index 99300f639b21..998ae418d415 100644 --- a/dev-python/bandit/bandit-1.5.1-r1.ebuild +++ b/dev-python/bandit/bandit-1.5.1-r1.ebuild @@ -36,7 +36,7 @@ DEPEND=" )" RDEPEND=" ${CDEPEND} - >=dev-python/git-python-1.0.1[${PYTHON_USEDEP}] + >=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}] >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}] >=dev-python/six-1.10.0[${PYTHON_USEDEP}] >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]" diff --git a/dev-python/bandit/bandit-1.6.2.ebuild b/dev-python/bandit/bandit-1.6.2.ebuild index 3f077f18a76b..f4cbf20f2c3f 100644 --- a/dev-python/bandit/bandit-1.6.2.ebuild +++ b/dev-python/bandit/bandit-1.6.2.ebuild @@ -36,7 +36,7 @@ DEPEND=" )" RDEPEND=" ${CDEPEND} - >=dev-python/git-python-1.0.1[${PYTHON_USEDEP}] + >=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}] >=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}] >=dev-python/six-1.10.0[${PYTHON_USEDEP}] >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]" diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest deleted file mode 100644 index ea18deb602d6..000000000000 --- a/dev-python/git-python/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f -DIST GitPython-3.1.0.gitbundle 8618276 BLAKE2B a1ecf49c47804b399453c6931fb54903309944b47a5a8ccd02d62f4b27943e60b4b58a9e67567008fa4d5bc791b1c86642659c045c885e2155e2c44bb1a4ea81 SHA512 a71463f861f840d3169a8351155665243d9f0f0a72e210940f9f7872cfd49b6ddfac827f0ec5bc61079d8066fc7ba210a03dd99f3bbd598e22ccbcacfe8e61b3 -DIST GitPython-3.1.0.tar.gz 430079 BLAKE2B eaf4d4bb2f589a96bcdcf28e7ac6c0b8eab691a1dee5fbbec6d4a93bab9f123b07073af8a1b85aa5547057e46e6c8c004215167790b559f3848bf20c3ec1697f SHA512 6dab8449cc1736d7f58f9788b56bf63cc2bf0f420104d6e010a9624d21f53f5b5d33135bad4d91b40d9543b454be839f8003828ffe512c35a6513c27a2dd4b53 -DIST gitdb-4.0.2.gitbundle 1474197 BLAKE2B 93dc8aeb3a43f0950bec1e8dc0c0156543a0a1ce1f20a7f0b2cd05c110338af05b6c6300c3f4b2c05e0f895496248e5fdca74eb599a4ea9aa983ed399d91f7c6 SHA512 8d4ebc93d6869a60b7717fc090000067e86a7e0373c281d0fb9939a6e2e283864256f827919eeb13be977254c0c71a4864d8e7c9b4b6dcc0af6275aa59681960 -DIST smmap-3.0.1.gitbundle 263781 BLAKE2B 6e06586010814ce0f59367c7f9289dad4891ee1debbc020b192af3945207da05b1e34907f1871f5b6b9638706b9e2fdacf390fcfff6bd06af84b9fd80f7e63a8 SHA512 c2b6c0b295c2997ed53727d3d1458ae7ec5ddbde9c83349286904726865fc026a70161955498b1a06371fb8d937e7386b80b4ea0c2e5d1c647718e6dbea93104 diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/git-python/git-python-2.1.11.ebuild deleted file mode 100644 index c995e67a79ea..000000000000 --- a/dev-python/git-python/git-python-2.1.11.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -MY_PN="GitPython" -MY_PV="${PV/_rc/.RC}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Library used to interact with Git repositories" -HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -# Tests only work with the GitPython repo -RESTRICT="test" - -RDEPEND=" - dev-vcs/git - >=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/ddt-1.1.1[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/${MY_P}" diff --git a/dev-python/git-python/git-python-3.1.0.ebuild b/dev-python/git-python/git-python-3.1.0.ebuild deleted file mode 100644 index 586d0abb46de..000000000000 --- a/dev-python/git-python/git-python-3.1.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -MY_PN=GitPython -MY_P=${MY_PN}-${PV} -GITDB_P=gitdb-4.0.2 -SMMAP_P=smmap-3.0.1 - -DESCRIPTION="Library used to interact with Git repositories" -HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/" -SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz - test? ( - https://dev.gentoo.org/~mgorny/dist/${MY_P}.gitbundle - https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle - https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle - )" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-vcs/git - >=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - >=dev-python/ddt-1.1.1[${PYTHON_USEDEP}] - )" - -distutils_enable_tests unittest - -src_test() { - git config --global user.email "you@example.com" || die - git config --global user.name "Your Name" || die - - git clone "${DISTDIR}/${MY_P}.gitbundle" "${T}"/test || die - git clone "${DISTDIR}/${GITDB_P}.gitbundle" \ - "${T}"/test/git/ext/gitdb || die - git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \ - "${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die - - cd "${T}"/test || die - # remove performance tests - rm -r git/test/performance || die - # tests requiring network access - sed -i -e 's:test_fetch_error:_&:' git/test/test_remote.py || die - # broken apparently - sed -i -e 's:test_rev_parse:_&:' git/test/test_repo.py || die - - distutils-r1_src_test -} diff --git a/dev-python/git-python/metadata.xml b/dev-python/git-python/metadata.xml deleted file mode 100644 index 7e626312fece..000000000000 --- a/dev-python/git-python/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - python@gentoo.org - Python - - - GitPython - gitpython-developers/GitPython - - diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild index 357e03afb462..74a745757acf 100644 --- a/dev-util/gertty/gertty-1.6.0-r1.ebuild +++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" ${CDEPEND} >=dev-python/urwid-1.2.1[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}] - >=dev-python/git-python-0.3.7[${PYTHON_USEDEP}] + >=dev-python/GitPython-0.3.7[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] >=dev-python/requests-2.5.3[${PYTHON_USEDEP}]