From patchwork Sun Feb 2 19:35:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 20065 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 70639168B4; Sun, 2 Feb 2020 19:36:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=ham 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 ESMTP id DA263168AC for ; Sun, 2 Feb 2020 19:36:10 +0000 (GMT) Received: from localhost ([::1]:59084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyL2Q-0004Sj-D0 for patchwork@mira.cbaines.net; Sun, 02 Feb 2020 14:36:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33509) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyL2K-0004Qy-3z for guix-patches@gnu.org; Sun, 02 Feb 2020 14:36:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyL2I-0004zk-Kp for guix-patches@gnu.org; Sun, 02 Feb 2020 14:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iyL2I-0004zH-HR for guix-patches@gnu.org; Sun, 02 Feb 2020 14:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iyL2I-0006om-CL for guix-patches@gnu.org; Sun, 02 Feb 2020 14:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39396] [PATCH] gnu: Add grip. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2020 19:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39396 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39396@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158067213526166 (code B ref -1); Sun, 02 Feb 2020 19:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Feb 2020 19:35:35 +0000 Received: from localhost ([127.0.0.1]:40569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iyL1q-0006ny-O1 for submit@debbugs.gnu.org; Sun, 02 Feb 2020 14:35:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:52088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iyL1p-0006no-0f for submit@debbugs.gnu.org; Sun, 02 Feb 2020 14:35:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33329) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyL1m-0004Lf-ET for guix-patches@gnu.org; Sun, 02 Feb 2020 14:35:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyL1k-00047P-So for guix-patches@gnu.org; Sun, 02 Feb 2020 14:35:30 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:50348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iyL1k-0003wi-Jm for guix-patches@gnu.org; Sun, 02 Feb 2020 14:35:28 -0500 Received: (qmail 26671 invoked by uid 1009); 2 Feb 2020 20:35:20 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25713. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.023534 secs); 02 Feb 2020 19:35:20 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 2 Feb 2020 20:35:20 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Sun, 2 Feb 2020 20:35:45 +0100 Message-Id: <20200202193545.17621-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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-web.scm (grip, python-path-and-address): New variables. --- gnu/packages/python-web.scm | 59 +++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9464021d82..a6b1e97ba1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -3494,3 +3495,61 @@ is part of the Weblate translation platform.") (description "This package provides an extended library for interacting with GitLab instances through their API.") (license license:lgpl3+))) + +(define-public python-path-and-address + (package + (name "python-path-and-address") + (version "2.0.1") + (source + (origin + ;; Use git-fetch because pypi-url fails. + (method git-fetch) + (uri (git-reference + (url "https://github.com/joeyespo/path-and-address") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6")))) + (build-system python-build-system) + (home-page "https://github.com/joeyespo/path-and-address") + (synopsis "Functions for command-line server tools used by humans") + (description "Path-and-address resolves ambiguities of command-line +interfaces, inferring which argument is the path, and which is the address.") + (license license:expat))) + +(define-public grip + ;; No release by upstream for quite some time, some bugs fixed since. See: + ;; https://github.com/joeyespo/grip/issues/304 + (let ((commit "27a4d6d87ea1d0ea7f7f120de55baabee3de73e3")) + (package + (name "grip") + (version (git-version "4.5.2" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joeyespo/grip") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kx5hgb3q19i4l18a4vqdq9af390xgpk88lp2ay75qi96k0dc68w")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docopt" ,python-docopt) + ("python-flask" ,python-flask) + ("python-markdown" ,python-markdown) + ("python-path-and-address" ,python-path-and-address) + ("python-pygments" ,python-pygments) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-responses" ,python-responses))) + (home-page "https://github.com/joeyespo/grip") + (synopsis "Preview Markdown files using the GitHub API") + (description "Grip is a command-line server application written in Python +that uses the GitHub Markdown API to render a local Markdown file. The styles +and rendering come directly from GitHub, so you'll know exactly how it will +appear. Changes you make to the file will be instantly reflected in the browser +without requiring a page refresh.") + (license license:expat)))) From patchwork Sun Feb 2 22:51:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 20069 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 3A529168AB; Sun, 2 Feb 2020 22:52:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 ESMTP id 72BD01671C for ; Sun, 2 Feb 2020 22:52:11 +0000 (GMT) Received: from localhost ([::1]:60272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyO67-00034w-0j for patchwork@mira.cbaines.net; Sun, 02 Feb 2020 17:52:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyO5z-000336-Sh for guix-patches@gnu.org; Sun, 02 Feb 2020 17:52:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyO5y-0006eM-PZ for guix-patches@gnu.org; Sun, 02 Feb 2020 17:52:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34745) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iyO5y-0006eG-LX for guix-patches@gnu.org; Sun, 02 Feb 2020 17:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iyO5y-0007G7-LZ for guix-patches@gnu.org; Sun, 02 Feb 2020 17:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39396] [PATCH v2 2/2] gnu: Add grip. References: <20200202193545.17621-1-kuba@kadziolka.net> In-Reply-To: <20200202193545.17621-1-kuba@kadziolka.net> Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2020 22:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39396 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39396@debbugs.gnu.org, efraim@flashner.co.il Received: via spool by 39396-submit@debbugs.gnu.org id=B39396.158068389527861 (code B ref 39396); Sun, 02 Feb 2020 22:52:02 +0000 Received: (at 39396) by debbugs.gnu.org; 2 Feb 2020 22:51:35 +0000 Received: from localhost ([127.0.0.1]:40717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iyO5W-0007FJ-Uq for submit@debbugs.gnu.org; Sun, 02 Feb 2020 17:51:35 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:46770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iyO5V-0007FB-Dv for 39396@debbugs.gnu.org; Sun, 02 Feb 2020 17:51:33 -0500 Received: (qmail 18428 invoked by uid 1009); 2 Feb 2020 23:51:32 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25713. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.024118 secs); 02 Feb 2020 22:51:32 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 2 Feb 2020 23:51:32 +0100 Date: Sun, 2 Feb 2020 23:51:57 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Message-ID: <20200202225157.ncrok6nfrp2dgwhz@gravity> MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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-web.scm (grip): New variable. --- gnu/packages/python-web.scm | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3e5253489b..35c168948c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3527,3 +3527,52 @@ with GitLab instances through their API.") (description "Path-and-address resolves ambiguities of command-line interfaces, inferring which argument is the path, and which is the address.") (license license:expat))) + +(define-public grip + ;; No release by upstream for quite some time, some bugs fixed since. See: + ;; https://github.com/joeyespo/grip/issues/304 + (let ((commit "27a4d6d87ea1d0ea7f7f120de55baabee3de73e3")) + (package + (name "grip") + (version (git-version "4.5.2" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joeyespo/grip") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kx5hgb3q19i4l18a4vqdq9af390xgpk88lp2ay75qi96k0dc68w")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docopt" ,python-docopt) + ("python-flask" ,python-flask) + ("python-markdown" ,python-markdown) + ("python-path-and-address" ,python-path-and-address) + ("python-pygments" ,python-pygments) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-responses" ,python-responses) + ("python-pytest" ,python-pytest))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Run 'check after 'install so that the grip binary is available. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (setenv "PATH" (string-append + (getenv "PATH") ":" + (assoc-ref %outputs "out") "/bin")) + (invoke "py.test" "-m" "not assumption")))))) + (home-page "https://github.com/joeyespo/grip") + (synopsis "Preview Markdown files using the GitHub API") + (description "Grip is a command-line server application written in Python +that uses the GitHub Markdown API to render a local Markdown file. The styles +and rendering come directly from GitHub, so you'll know exactly how it will +appear. Changes you make to the file will be instantly reflected in the browser +without requiring a page refresh.") + (license license:expat))))