diff options
| author |   Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2020-11-09 13:58:35 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2020-11-17 16:20:48 +0200 |
| commit | 070e6aea698ba53c1d463390ffc3ed70129d88ea (patch) | |
| tree | 4973d3146d7352c7744b24d11b3163f5d6169d3c /dev-python/three-merge | |
| parent | dev-python/pyls-black: Black plugin for the Python Language Server (diff) | |
| download | gentoo-070e6aea698ba53c1d463390ffc3ed70129d88ea.tar.gz gentoo-070e6aea698ba53c1d463390ffc3ed70129d88ea.tar.bz2 gentoo-070e6aea698ba53c1d463390ffc3ed70129d88ea.zip | |
dev-python/three-merge: lib to perform 3-way merge between strings
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-python/three-merge')
| -rw-r--r-- | dev-python/three-merge/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/three-merge/metadata.xml | 16 | ||||
| -rw-r--r-- | dev-python/three-merge/three-merge-0.1.1.ebuild | 26 |
3 files changed, 43 insertions, 0 deletions
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest new file mode 100644 index 000000000000..6555f1532621 --- /dev/null +++ b/dev-python/three-merge/Manifest @@ -0,0 +1 @@ +DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml new file mode 100644 index 000000000000..a1562d89ee7a --- /dev/null +++ b/dev-python/three-merge/metadata.xml @@ -0,0 +1,16 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <upstream> + <remote-id type="pypi">three-merge</remote-id> + <remote-id type="github">spyder-ide/three-merge</remote-id> + </upstream> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> +</pkgmetadata> diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild new file mode 100644 index 000000000000..a6dd1a854807 --- /dev/null +++ b/dev-python/three-merge/three-merge-0.1.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit distutils-r1 + +DESCRIPTION="Simple Python library to perform a 3-way merge between strings" +HOMEPAGE="https://github.com/spyder-ide/three-merge + https://pypi.org/project/three-merge/" +SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]" + +BDEPEND="test? ( + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] +)" + +distutils_enable_tests pytest |