From: Vinicius Monego <monego@posteo.net>
To: 47906@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#47906] [PATCH 03/22] gnu: Add python-three-merge.
Date: Tue, 20 Apr 2021 05:22:27 +0000 [thread overview]
Message-ID: <20210420052246.470690-3-monego@posteo.net> (raw)
In-Reply-To: <20210420052246.470690-1-monego@posteo.net>
* gnu/packages/python-xyz.scm (python-three-merge): New variable.
---
gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e908070a62..a8fb9d9cbc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8095,6 +8095,40 @@ solve linear problems.")
algorithm.")
(license license:asl2.0)))
+(define-public python-three-merge
+ (package
+ (name "python-three-merge")
+ (version "0.1.1")
+ (source
+ (origin
+ ;; There are no tests in the PyPI tarball.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/spyder-ide/three-merge")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fw28swh6jq4myr09j7gv68l241b8vwg470ak5xv0x4xwh2a1m86"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:test-target "pytest"))
+ (propagated-inputs
+ `(("python-diff-match-patch" ,python-diff-match-patch)))
+ (native-inputs
+ `(("python-flaky" ,python-flaky)
+ ("python-pytest" ,python-pytest)
+ ("python-pytest-cov" ,python-pytest-cov)
+ ("python-pytest-runner" ,python-pytest-runner)
+ ("python-pytest-timeout" ,python-pytest-timeout)))
+ (home-page "https://github.com/spyder-ide/three-merge")
+ (synopsis "Library for merging two strings with respect to a base one")
+ (description
+ "This package provides a Python library to perform a 3-way merge between
+strings, based on @code{diff-match-patch}. This library performs merges at a
+character level, as opposed to most VCS systems, which opt for a line-based
+approach.")
+ (license license:expat)))
+
(define-public snakemake
(package
(name "snakemake")
--
2.31.1
next prev parent reply other threads:[~2021-04-20 5:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 5:19 [bug#47906] [PATCH 00/22] Add Spyder Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 01/22] gnu: Add python-spyder-kernels Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 02/22] gnu: Add python-textdistance Vinicius Monego
2021-04-20 5:22 ` Vinicius Monego [this message]
2021-04-20 5:22 ` [bug#47906] [PATCH 04/22] gnu: Add python-pyls-black Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 05/22] gnu: Add python-pyls-spyder Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 06/22] gnu: python-watchdog: Update to 1.0.2 Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 07/22] gnu: python-qtconsole: Update to 5.0.3 Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 08/22] gnu: python-qtconsole: Enable tests Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 09/22] gnu: Add python-tinycss Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 10/22] gnu: Add python-qstylizer Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 11/22] gnu: python-language-server: Enable tests Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 12/22] gnu: Add python-pytest-qt Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 13/22] gnu: Add python-qtawesome Vinicius Monego
2021-04-28 12:49 ` Lars-Dominik Braun
2021-04-29 16:07 ` Vinicius Monego
2021-05-02 14:32 ` Lars-Dominik Braun
2021-05-08 9:30 ` Lars-Dominik Braun
2021-04-20 5:22 ` [bug#47906] [PATCH 14/22] gnu: Add python-qtsass Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 15/22] gnu: python-qdarkstyle: Update to 3.0.2 Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 16/22] gnu: Add python-easyprocess Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 17/22] gnu: Add python-entrypoint2 Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 18/22] gnu: Add python-pyvirtualdisplay Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 19/22] gnu: Add python-pytest-xvfb Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 20/22] gnu: python-diff-match-patch: Update to 20200713 Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 21/22] gnu: python-language-server: Relax dependency versions Vinicius Monego
2021-04-20 5:22 ` [bug#47906] [PATCH 22/22] gnu: Add spyder Vinicius Monego
2021-05-26 21:46 ` [bug#47906] [PATCH 00/22] Add Spyder Nicolas Goaziou
2023-04-20 0:29 ` Vinicius Monego
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210420052246.470690-3-monego@posteo.net \
--to=monego@posteo.net \
--cc=47906@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.