[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47906] [PATCH 03/22] gnu: Add python-three-merge.
From: |
Vinicius Monego |
Subject: |
[bug#47906] [PATCH 03/22] gnu: Add python-three-merge. |
Date: |
Tue, 20 Apr 2021 05:22:27 +0000 |
* 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
- [bug#47906] [PATCH 00/22] Add Spyder, Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 01/22] gnu: Add python-spyder-kernels., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 02/22] gnu: Add python-textdistance., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 03/22] gnu: Add python-three-merge.,
Vinicius Monego <=
- [bug#47906] [PATCH 04/22] gnu: Add python-pyls-black., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 05/22] gnu: Add python-pyls-spyder., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 07/22] gnu: python-qtconsole: Update to 5.0.3., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 06/22] gnu: python-watchdog: Update to 1.0.2., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 09/22] gnu: Add python-tinycss., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 11/22] gnu: python-language-server: Enable tests., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 12/22] gnu: Add python-pytest-qt., Vinicius Monego, 2021/04/20
- [bug#47906] [PATCH 13/22] gnu: Add python-qtawesome., Vinicius Monego, 2021/04/20