From patchwork Tue Apr 20 05:22:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 28689 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3FA6527BC79; Tue, 20 Apr 2021 06:25:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E996527BC6C for ; Tue, 20 Apr 2021 06:25:17 +0100 (BST) Received: from localhost ([::1]:38452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYisv-0002Df-0y for patchwork@mira.cbaines.net; Tue, 20 Apr 2021 01:25:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYish-0002DJ-Au for guix-patches@gnu.org; Tue, 20 Apr 2021 01:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41120) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYish-0003Yy-3k for guix-patches@gnu.org; Tue, 20 Apr 2021 01:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYish-0007eF-0p for guix-patches@gnu.org; Tue, 20 Apr 2021 01:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47906] [PATCH 03/22] gnu: Add python-three-merge. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Apr 2021 05:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47906 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47906@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 47906-submit@debbugs.gnu.org id=B47906.161889624829202 (code B ref 47906); Tue, 20 Apr 2021 05:25:02 +0000 Received: (at 47906) by debbugs.gnu.org; 20 Apr 2021 05:24:08 +0000 Received: from localhost ([127.0.0.1]:52637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYiro-0007aw-CP for submit@debbugs.gnu.org; Tue, 20 Apr 2021 01:24:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYirj-0007a5-OX for 47906@debbugs.gnu.org; Tue, 20 Apr 2021 01:24:04 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2731F2400E5 for <47906@debbugs.gnu.org>; Tue, 20 Apr 2021 07:23:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618896238; bh=FKeBfjt+6OEk0NAfpTvxtGfcEDDtNKYCms3mRfJKfbM=; h=From:To:Cc:Subject:Date:From; b=EW4L/rSuTNdvJZCqeOvkzXQQPBg91LnnN1PDKnTuSPAwAbnZTF6iBUIpwbE1EhhPm pxTnRBJV87YJmfsYmRAL6xHhGfguoCdc4gcNsQnfnrVZqCPIrTmcA7KXN6ivZYHBq1 I1oYrznlSWfH7HwKviz0Ru0nvhVdpkNYTswRdooqTttxDVshj2bx7dWH88uhK+ORWg mzkqXvqU7nfZdCe4i2r+jrHqwcAUSZAHCAl5rfwjgS7gnfX3phC1gvrfXGOQcj1oMN x4+MlAoGlaQlgk8QMFGQoa6Jw5N3y4aAEC85LjS1FnT2qKu7sSpro2u6k4cWVuwi6C gJ5UjRH8F/EyQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FPXCw5y1Rz6tmH; Tue, 20 Apr 2021 07:23:56 +0200 (CEST) From: Vinicius Monego Date: Tue, 20 Apr 2021 05:22:27 +0000 Message-Id: <20210420052246.470690-3-monego@posteo.net> In-Reply-To: <20210420052246.470690-1-monego@posteo.net> References: <20210420052246.470690-1-monego@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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")