Date: Fri, 26 Feb 2021 11:25:36 +0000 (UTC) From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566594 - in head/textproc: . py-three-merge Message-ID: <202102261125.11QBPaqf004059@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rhurlin Date: Fri Feb 26 11:25:36 2021 New Revision: 566594 URL: https://svnweb.freebsd.org/changeset/ports/566594 Log: New port: textproc/py-three-merge: Perform a 3-way merge between strings https://github.com/spyder-ide/three-merge Added: head/textproc/py-three-merge/ head/textproc/py-three-merge/Makefile (contents, props changed) head/textproc/py-three-merge/distinfo (contents, props changed) head/textproc/py-three-merge/pkg-descr (contents, props changed) Modified: head/textproc/Makefile Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Fri Feb 26 11:03:56 2021 (r566593) +++ head/textproc/Makefile Fri Feb 26 11:25:36 2021 (r566594) @@ -1429,6 +1429,7 @@ SUBDIR += py-terminaltables SUBDIR += py-textfsm SUBDIR += py-texttable + SUBDIR += py-three-merge SUBDIR += py-tinycss SUBDIR += py-tinycss2 SUBDIR += py-toml Added: head/textproc/py-three-merge/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-three-merge/Makefile Fri Feb 26 11:25:36 2021 (r566594) @@ -0,0 +1,30 @@ +# Created by: Rainer Hurling <rhurlin@gwdg.de> +# $FreeBSD$ + +PORTNAME= three-merge +PORTVERSION= 0.1.1 +CATEGORIES= textproc python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= rhurlin@FreeBSD.org +COMMENT= Perform a 3-way merge between strings + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${PY_FLAVOR} +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ +# ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ +# ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} + +USES= python:3.6+ +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +# test files not present ATM in the PyPI source file +#do-test: +# @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -x -v three_merge/tests + +.include <bsd.port.mk> Added: head/textproc/py-three-merge/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-three-merge/distinfo Fri Feb 26 11:25:36 2021 (r566594) @@ -0,0 +1,3 @@ +TIMESTAMP = 1614332502 +SHA256 (three-merge-0.1.1.tar.gz) = 60f6afe144595560d63ae32625351bcef3b94733b54eb97800a9feb0f3d9d970 +SIZE (three-merge-0.1.1.tar.gz) = 5898 Added: head/textproc/py-three-merge/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-three-merge/pkg-descr Fri Feb 26 11:25:36 2021 (r566594) @@ -0,0 +1,5 @@ +Simple Python library to perform a 3-way merge between strings, based on +diff-match-patch. This library performs merges at a character level, as +opposed to most VCS systems, which opt for a line-based approach. + +WWW: https://github.com/spyder-ide/three-merge
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102261125.11QBPaqf004059>