From patchwork Sat Aug 28 11:51:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 32344 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 8AC7D27BBE3; Sat, 28 Aug 2021 12:53:43 +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.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 400D927BBE1 for ; Sat, 28 Aug 2021 12:53:43 +0100 (BST) Received: from localhost ([::1]:59130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJwu6-00039f-2x for patchwork@mira.cbaines.net; Sat, 28 Aug 2021 07:53:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJwtS-00037E-Me for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJwtS-00064T-ED for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJwtS-0006qK-D1 for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49834] [PATCH 1/6] gnu: Add python-flake8-todo. References: <20210802181359.10695-1-goodoldpaul@autistici.org> In-Reply-To: <20210802181359.10695-1-goodoldpaul@autistici.org> Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Aug 2021 11:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49834@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 49834-submit@debbugs.gnu.org id=B49834.163015153326205 (code B ref 49834); Sat, 28 Aug 2021 11:53:02 +0000 Received: (at 49834) by debbugs.gnu.org; 28 Aug 2021 11:52:13 +0000 Received: from localhost ([127.0.0.1]:53493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsb-0006oH-0d for submit@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:12 -0400 Received: from latitanza.investici.org ([82.94.249.234]:25095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsV-0006ns-3M for 49834@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:07 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4GxZgk4YjszGp9q; Sat, 28 Aug 2021 11:52:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1630151522; bh=dXzEd4RerhhZGBUBwDDT2/O3yxj5HNwnBT+fexXKAz8=; h=From:To:Cc:Subject:Date:From; b=HaA9/pQ7S1SgL3yWifT4uL059IloNdr7Q5EKkQWSFYAb1fVw/kaDMRnzu9mt1PUSI 7NbPni3X+zUFXSolQwTPhYzIMb8JHpPhYgpUugWQmYT8uYOucTJC3YLy0yH4p7Hwji 3/6da/1k+qDuZVZAS7HAOeRlrDJXJvAeCOPFOa5k= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4GxZgk3ZgLzGp9V; Sat, 28 Aug 2021 11:52:02 +0000 (UTC) From: Giacomo Leidi Date: Sat, 28 Aug 2021 13:51:48 +0200 Message-Id: <20210828115153.5607-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.33.0 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-flake8-todo): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) base-commit: 75a3413b4e5c1f7443eb944a36ff364f4c4085f4 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 59eb473857..1e4f04337d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9613,6 +9613,29 @@ lints.") (description "This package provides a Flake8 lint for quotes.") (license license:expat))) +(define-public python-flake8-todo + (package + (name "python-flake8-todo") + (version "0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8-todo" version)) + (sha256 + (base32 + "05arm0sch3r8248035kilmf01z0mxsahw6vpbbz0d343zy8m8k3f")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pycodestyle" ,python-pycodestyle))) + (home-page + "https://github.com/schlamar/flake8-todo") + (synopsis + "TODO notes checker, plugin for flake8") + (description + "This package provides the @code{flake8-todo} Python module, a +TODO notes checker plugin for flake8.") + (license license:expat))) + (define-public python-autoflake (package (name "python-autoflake") From patchwork Sat Aug 28 11:51:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 32345 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 7C47927BBE3; Sat, 28 Aug 2021 12:53:44 +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.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 452E427BBE1 for ; Sat, 28 Aug 2021 12:53:44 +0100 (BST) Received: from localhost ([::1]:59156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJwu6-0003B7-Rz for patchwork@mira.cbaines.net; Sat, 28 Aug 2021 07:53:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJwtT-000384-2s for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJwtS-00065M-RU for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJwtS-0006qR-QF for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49834] [PATCH 2/6] gnu: Add python-dotenv. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Aug 2021 11:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49834@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 49834-submit@debbugs.gnu.org id=B49834.163015153626221 (code B ref 49834); Sat, 28 Aug 2021 11:53:02 +0000 Received: (at 49834) by debbugs.gnu.org; 28 Aug 2021 11:52:16 +0000 Received: from localhost ([127.0.0.1]:53495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwse-0006oc-U3 for submit@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:16 -0400 Received: from latitanza.investici.org ([82.94.249.234]:40215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsV-0006nt-91 for 49834@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:07 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4GxZgk5pyzzGp9t; Sat, 28 Aug 2021 11:52:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1630151522; bh=vlirCSDLxK9k97zi0hp0GbOXsdTtoYJqGeWy6arUjrk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AEpolrPloGSXrbwtlMwd64uGJrIDDyNmaDavnp8MQkKCR+ZLqGhzCK/oFUmmbjEeT gwdSXjxQ18td92ZyXJB2CgObkg5UyhND0PYGX1baCT4eJ9oDVZLmNifVWznULePrxp jow+B6BlejVdV2EzUzez4tBSMqNIP3pu2Up+hSDo= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4GxZgk4tr6zGp9V; Sat, 28 Aug 2021 11:52:02 +0000 (UTC) From: Giacomo Leidi Date: Sat, 28 Aug 2021 13:51:49 +0200 Message-Id: <20210828115153.5607-2-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210828115153.5607-1-goodoldpaul@autistici.org> References: <20210828115153.5607-1-goodoldpaul@autistici.org> 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-dotenv): New variable. --- gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1e4f04337d..128ac9fd0c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26297,3 +26297,30 @@ a (rather superficial) static analysis, and constructs a directed graph of the objects in the combined source, and how they define or use each other. The graph can be output for rendering by GraphViz or yEd.") (license license:gpl2))) + +(define-public python-dotenv + (package + (name "python-dotenv") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-dotenv" version)) + (sha256 + (base32 + "0b90br3f48ykx5ddfpx2zmsh4vmdqw6s812drcy9pn2q3qyarypg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click-5))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-sh" ,python-sh))) + (home-page + "https://github.com/theskumar/python-dotenv") + (synopsis + "Setup environment variables according to .env files") + (description + "This package provides the @code{python-dotenv} Python module to +read key-value pairs from a .env file and set them as environment variables") + (license license:bsd-3))) From patchwork Sat Aug 28 11:51:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 32346 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 AB24927BBE3; Sat, 28 Aug 2021 12:54:14 +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.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 64A9727BBE1 for ; Sat, 28 Aug 2021 12:54:14 +0100 (BST) Received: from localhost ([::1]:60496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJwub-00045G-1r for patchwork@mira.cbaines.net; Sat, 28 Aug 2021 07:54:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJwtT-00038t-GH for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJwtT-00065l-7s for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJwtT-0006qY-6D for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49834] [PATCH 3/6] gnu: Add python-box. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Aug 2021 11:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49834@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 49834-submit@debbugs.gnu.org id=B49834.163015154026233 (code B ref 49834); Sat, 28 Aug 2021 11:53:03 +0000 Received: (at 49834) by debbugs.gnu.org; 28 Aug 2021 11:52:20 +0000 Received: from localhost ([127.0.0.1]:53497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsi-0006os-RL for submit@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:20 -0400 Received: from latitanza.investici.org ([82.94.249.234]:60967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsV-0006nv-Es for 49834@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:11 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4GxZgk72sVzGp9v; Sat, 28 Aug 2021 11:52:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1630151522; bh=GNiHLvVp4I6i2Yi/t3W8vXD0epzzpCIYXbKTMbQ+wOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oy9N6YjSUfrXwm5xAYnPuuf1/7ptpw7Mx+NQLhBDPp4Jv03Kp2GY5MUODh7uE3xbk 5DgfR9V2bNXVu9B4op3Gw6nMK/k2lSL8+RiLLTUnR2Mqe5Q3JTZCWRZJSewcC/3HJX k1yyZu0GGAUQdU4q6OW0eBcCo5rq5fCC566+OtPw= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4GxZgk69ClzGp9V; Sat, 28 Aug 2021 11:52:02 +0000 (UTC) From: Giacomo Leidi Date: Sat, 28 Aug 2021 13:51:50 +0200 Message-Id: <20210828115153.5607-3-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210828115153.5607-1-goodoldpaul@autistici.org> References: <20210828115153.5607-1-goodoldpaul@autistici.org> 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-box): New variable. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 128ac9fd0c..caff26e872 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26324,3 +26324,27 @@ graph can be output for rendering by GraphViz or yEd.") "This package provides the @code{python-dotenv} Python module to read key-value pairs from a .env file and set them as environment variables") (license license:bsd-3))) + +(define-public python-box + (package + (name "python-box") + (version "5.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-box" version)) + (sha256 + (base32 + "0jhrdif57khx2hsw1q6a9x42knwcvq8ijgqyq1jmll6y6ifyzm2f")))) + (build-system python-build-system) + (propagated-inputs + `(("python-msgpack" ,python-msgpack) + ("python-ruamel.yaml" ,python-ruamel.yaml) + ("python-toml" ,python-toml))) + (home-page "https://github.com/cdgriffith/Box") + (synopsis + "Advanced Python dictionaries with dot notation access") + (description + "This package provides the @code{python-box} Python module. +It implements advanced Python dictionaries with dot notation access.") + (license license:expat))) From patchwork Sat Aug 28 11:51:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 32348 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 5C6F727BBE3; Sat, 28 Aug 2021 12:55:09 +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.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 23EDA27BBE1 for ; Sat, 28 Aug 2021 12:55:09 +0100 (BST) Received: from localhost ([::1]:33812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJwvU-00059k-2v for patchwork@mira.cbaines.net; Sat, 28 Aug 2021 07:55:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJwtU-0003Ab-8o for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJwtU-00066v-0j for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJwtT-0006qn-Vo for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49834] [PATCH 4/6] gnu: python-ruamel.yaml: Update to 0.17.10. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Aug 2021 11:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49834@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 49834-submit@debbugs.gnu.org id=B49834.163015154826255 (code B ref 49834); Sat, 28 Aug 2021 11:53:03 +0000 Received: (at 49834) by debbugs.gnu.org; 28 Aug 2021 11:52:28 +0000 Received: from localhost ([127.0.0.1]:53501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsq-0006pG-NH for submit@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:28 -0400 Received: from latitanza.investici.org ([82.94.249.234]:52569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsV-0006nw-KX for 49834@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:11 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4GxZgl16rbzGpB6; Sat, 28 Aug 2021 11:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1630151523; bh=VGwZ7hB/HNJ9FFIDAaNkrF5kOtkkcq1pHopgoITWx3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PT/iu5SITCwZieAeTkDN/e2Zugln+tGN5qr2yIV8kXp4xJ9Q482H+n9r8Ja2E25iE HCuVnXG3OgVDBeFmFFvLt4YQIK4GZL9TdzVy6fIZBCYP9uGmyl4x2Uh4W+kisEKGk7 2NqvPJgSDPNKTBsDYONTAsrek6Enq85NiDFoahRY= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4GxZgl0HfZzGp9V; Sat, 28 Aug 2021 11:52:03 +0000 (UTC) From: Giacomo Leidi Date: Sat, 28 Aug 2021 13:51:51 +0200 Message-Id: <20210828115153.5607-4-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210828115153.5607-1-goodoldpaul@autistici.org> References: <20210828115153.5607-1-goodoldpaul@autistici.org> 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/serialization.scm (python-ruamel.yaml): Update to 0.17.10. --- gnu/packages/serialization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 0e79b7c89c..b8f21f2375 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -532,14 +532,14 @@ it is comparable to protobuf.") (define-public python-ruamel.yaml (package (name "python-ruamel.yaml") - (version "0.15.83") + (version "0.17.10") (source (origin (method url-fetch) (uri (pypi-uri "ruamel.yaml" version)) (sha256 (base32 - "0p4i8ad28cbbbjja8b9274irkhnphhvhap3aym6yb8xfp1d72kpw")))) + "0rwywdbmy20qwssccydpaval2vq36825fiva374zf3vavkbchsqh")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) From patchwork Sat Aug 28 11:51:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 32347 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 02E2E27BBE3; Sat, 28 Aug 2021 12:55:03 +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.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 BCAC727BBE1 for ; Sat, 28 Aug 2021 12:55:02 +0100 (BST) Received: from localhost ([::1]:33498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJwvN-0004w9-Mr for patchwork@mira.cbaines.net; Sat, 28 Aug 2021 07:55:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJwtT-00039g-T3 for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJwtT-000662-Ka for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJwtT-0006qg-JO for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49834] [PATCH 5/6] gnu: Add python-pep8-naming. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Aug 2021 11:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49834@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 49834-submit@debbugs.gnu.org id=B49834.163015154426245 (code B ref 49834); Sat, 28 Aug 2021 11:53:03 +0000 Received: (at 49834) by debbugs.gnu.org; 28 Aug 2021 11:52:24 +0000 Received: from localhost ([127.0.0.1]:53499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsm-0006p4-PG for submit@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:24 -0400 Received: from latitanza.investici.org ([82.94.249.234]:36139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsV-0006nx-PS for 49834@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:11 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4GxZgl2D6kzGpB8; Sat, 28 Aug 2021 11:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1630151523; bh=0YoedlfjLGORfm/rQs3RCeHsR3wgjvRwmWPaPxBepYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OJ6OtdKlFeX2N5uVD3OGTVVtjm/huNfqptjCcf3EQTo9xryVSc4mJlEaW7TPu100v AeTOegs6pmMXDL8VrCGroApAVT+6s9hFx0fS1b75Vdg37eMz7afx4bOqPt+OBMY/+/ fcZl05Oc7iinwNOgDo2a8XOqsjuVuee8Z4KiGqdU= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4GxZgl1T0fzGp9V; Sat, 28 Aug 2021 11:52:03 +0000 (UTC) From: Giacomo Leidi Date: Sat, 28 Aug 2021 13:51:52 +0200 Message-Id: <20210828115153.5607-5-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210828115153.5607-1-goodoldpaul@autistici.org> References: <20210828115153.5607-1-goodoldpaul@autistici.org> 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-pep8-naming): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index caff26e872..afece6381c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9242,6 +9242,31 @@ PEP 8.") (define-public python2-pep8 (package-with-python2 python-pep8)) +(define-public python-pep8-naming + (package + (name "python-pep8-naming") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pep8-naming" version)) + (sha256 + (base32 + "04kyh9hkpyc8jzj16d1kkk29b5n8miqdvbs0zm035n1z5z5kx6hz")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flake8" ,python-flake8) + ("python-flake8-polyfill" + ,python-flake8-polyfill))) + (home-page + "https://github.com/PyCQA/pep8-naming") + (synopsis + "Check PEP-8 naming conventions") + (description + "This package provides the @code{pep8-naming} Python module, a +plugin for flake8 to check PEP-8 naming conventions.") + (license license:expat))) + (define-public python-pep517 (package (inherit python-pep517-bootstrap) From patchwork Sat Aug 28 11:51:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 32349 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 A9BFE27BBE3; Sat, 28 Aug 2021 12:56:01 +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.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 D5B4A27BBE1 for ; Sat, 28 Aug 2021 12:56:00 +0100 (BST) Received: from localhost ([::1]:35360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJwwJ-0006Ax-Px for patchwork@mira.cbaines.net; Sat, 28 Aug 2021 07:56:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJwtU-0003Ba-MO for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJwtU-00067I-EJ for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJwtU-0006qu-CX for guix-patches@gnu.org; Sat, 28 Aug 2021 07:53:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49834] [PATCH 6/6] gnu: Add dynaconf. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Aug 2021 11:53:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49834@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 49834-submit@debbugs.gnu.org id=B49834.163015155426269 (code B ref 49834); Sat, 28 Aug 2021 11:53:04 +0000 Received: (at 49834) by debbugs.gnu.org; 28 Aug 2021 11:52:34 +0000 Received: from localhost ([127.0.0.1]:53503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsu-0006pQ-Kc for submit@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:34 -0400 Received: from latitanza.investici.org ([82.94.249.234]:23579) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJwsZ-0006o7-GL for 49834@debbugs.gnu.org; Sat, 28 Aug 2021 07:52:14 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4GxZgl3Lm5zGpB9; Sat, 28 Aug 2021 11:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1630151523; bh=i94wboKQ3J7ERBlQAwjvVdp6MGLlpZRzYNqV+9cXlcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uU5cZXMbIMymuzz+lfsl+yaCGEDhWpCVjryAzXxxSMmTXMF8eNN4k6RpM8WCxFQn+ 5GPxA6Anz2rhyyshuKc3CNBne5rfvaeVuzTebSsYcpKI1x+3WEOzF958veOOhQh66N hujUVV2xoRdy7yUvUFfGPp8rsmaXb2jeKebW/ZBA= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4GxZgl2ZnxzGp9V; Sat, 28 Aug 2021 11:52:03 +0000 (UTC) From: Giacomo Leidi Date: Sat, 28 Aug 2021 13:51:53 +0200 Message-Id: <20210828115153.5607-6-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210828115153.5607-1-goodoldpaul@autistici.org> References: <20210828115153.5607-1-goodoldpaul@autistici.org> 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-colorama-0.4.1): New variable, (python-dotenv-0.13.0): New variable, (dynaconf): New variable. * gnu/packages/patches/dynaconf-Unvendor-dependencies.patch: New file. * local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../dynaconf-Unvendor-dependencies.patch | 161 ++++++++++++++++++ gnu/packages/python-xyz.scm | 94 ++++++++++ 3 files changed, 256 insertions(+) create mode 100644 gnu/packages/patches/dynaconf-Unvendor-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 14cd1cc6ad..4e76b5a2b3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -977,6 +977,7 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/dynaconf-Unvendor-dependencies.patch \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ %D%/packages/patches/ecl-16-libffi.patch \ diff --git a/gnu/packages/patches/dynaconf-Unvendor-dependencies.patch b/gnu/packages/patches/dynaconf-Unvendor-dependencies.patch new file mode 100644 index 0000000000..10b72d5013 --- /dev/null +++ b/gnu/packages/patches/dynaconf-Unvendor-dependencies.patch @@ -0,0 +1,161 @@ +From 3558d30d5916ec6a91ce0d9c201ff9a11675d7c3 Mon Sep 17 00:00:00 2001 +From: Giacomo Leidi +Date: Mon, 2 Aug 2021 19:29:07 +0200 +Subject: [PATCH] Use system dependencies. + +Box was not unvendored because it appears to be heavily patched. +--- + dynaconf/cli.py | 4 ++-- + dynaconf/default_settings.py | 2 +- + dynaconf/loaders/env_loader.py | 2 +- + dynaconf/loaders/toml_loader.py | 2 +- + dynaconf/loaders/yaml_loader.py | 2 +- + dynaconf/utils/parse_conf.py | 2 +- + dynaconf/vendor/box/converters.py | 6 +++--- + dynaconf/vendor/box/from_file.py | 6 +++--- + tests/test_cli.py | 2 +- + 9 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/dynaconf/cli.py b/dynaconf/cli.py +index 2d45e52..7df767a 100644 +--- a/dynaconf/cli.py ++++ b/dynaconf/cli.py +@@ -20,8 +20,8 @@ from dynaconf.utils.functional import empty + from dynaconf.utils.parse_conf import parse_conf_data + from dynaconf.validator import ValidationError + from dynaconf.validator import Validator +-from dynaconf.vendor import click +-from dynaconf.vendor import toml ++import click ++import toml + + + CWD = Path.cwd() +diff --git a/dynaconf/default_settings.py b/dynaconf/default_settings.py +index 66601b0..9605fc5 100644 +--- a/dynaconf/default_settings.py ++++ b/dynaconf/default_settings.py +@@ -8,7 +8,7 @@ from dynaconf.utils import upperfy + from dynaconf.utils import warn_deprecations + from dynaconf.utils.files import find_file + from dynaconf.utils.parse_conf import parse_conf_data +-from dynaconf.vendor.dotenv import load_dotenv ++from dotenv import load_dotenv + + + def try_renamed(key, value, older_key, current_key): +diff --git a/dynaconf/loaders/env_loader.py b/dynaconf/loaders/env_loader.py +index e7b13bd..b034c8a 100644 +--- a/dynaconf/loaders/env_loader.py ++++ b/dynaconf/loaders/env_loader.py +@@ -2,7 +2,7 @@ from os import environ + + from dynaconf.utils import upperfy + from dynaconf.utils.parse_conf import parse_conf_data +-from dynaconf.vendor.dotenv import cli as dotenv_cli ++from dotenv import cli as dotenv_cli + + + IDENTIFIER = "env" +diff --git a/dynaconf/loaders/toml_loader.py b/dynaconf/loaders/toml_loader.py +index 07b973f..d81d675 100644 +--- a/dynaconf/loaders/toml_loader.py ++++ b/dynaconf/loaders/toml_loader.py +@@ -5,7 +5,7 @@ from dynaconf import default_settings + from dynaconf.constants import TOML_EXTENSIONS + from dynaconf.loaders.base import BaseLoader + from dynaconf.utils import object_merge +-from dynaconf.vendor import toml ++import toml + + + def load(obj, env=None, silent=True, key=None, filename=None): +diff --git a/dynaconf/loaders/yaml_loader.py b/dynaconf/loaders/yaml_loader.py +index 33c6532..3ef419a 100644 +--- a/dynaconf/loaders/yaml_loader.py ++++ b/dynaconf/loaders/yaml_loader.py +@@ -7,7 +7,7 @@ from dynaconf.constants import YAML_EXTENSIONS + from dynaconf.loaders.base import BaseLoader + from dynaconf.utils import object_merge + from dynaconf.utils.parse_conf import try_to_encode +-from dynaconf.vendor.ruamel import yaml ++from ruamel import yaml + + # Add support for Dynaconf Lazy values to YAML dumper + yaml.SafeDumper.yaml_representers[ +diff --git a/dynaconf/utils/parse_conf.py b/dynaconf/utils/parse_conf.py +index 5fc8234..6509c35 100644 +--- a/dynaconf/utils/parse_conf.py ++++ b/dynaconf/utils/parse_conf.py +@@ -8,7 +8,7 @@ from dynaconf.utils import extract_json_objects + from dynaconf.utils import multi_replace + from dynaconf.utils import recursively_evaluate_lazy_format + from dynaconf.utils.boxing import DynaBox +-from dynaconf.vendor import toml ++import toml + + try: + from jinja2 import Environment +diff --git a/dynaconf/vendor/box/converters.py b/dynaconf/vendor/box/converters.py +index 93cdcfb..c81877a 100644 +--- a/dynaconf/vendor/box/converters.py ++++ b/dynaconf/vendor/box/converters.py +@@ -7,9 +7,9 @@ _B='utf-8' + _A=None + import csv,json,sys,warnings + from pathlib import Path +-import dynaconf.vendor.ruamel.yaml as yaml ++import ruamel.yaml as yaml + from dynaconf.vendor.box.exceptions import BoxError,BoxWarning +-from dynaconf.vendor import toml ++import toml + BOX_PARAMETERS='default_box','default_box_attr','conversion_box','frozen_box','camel_killer_box','box_safe_prefix','box_duplicates','ordered_box','default_box_none_transform','box_dots','modify_tuples_box','box_intact_types','box_recast' + def _exists(filename,create=_E): + A=filename;B=Path(A) +@@ -75,4 +75,4 @@ def _to_csv(box_list,filename,encoding=_B,errors=_C): + for G in A:D.writerow(G) + def _from_csv(filename,encoding=_B,errors=_C): + A=filename;_exists(A) +- with open(A,_G,encoding=encoding,errors=errors,newline='')as B:C=csv.DictReader(B);return[A for A in C] +\ No newline at end of file ++ with open(A,_G,encoding=encoding,errors=errors,newline='')as B:C=csv.DictReader(B);return[A for A in C] +diff --git a/dynaconf/vendor/box/from_file.py b/dynaconf/vendor/box/from_file.py +index daa1137..4a2739d 100644 +--- a/dynaconf/vendor/box/from_file.py ++++ b/dynaconf/vendor/box/from_file.py +@@ -1,8 +1,8 @@ + from json import JSONDecodeError + from pathlib import Path + from typing import Union +-from dynaconf.vendor.toml import TomlDecodeError +-from dynaconf.vendor.ruamel.yaml import YAMLError ++from toml import TomlDecodeError ++from ruamel.yaml import YAMLError + from .exceptions import BoxError + from .box import Box + from .box_list import BoxList +@@ -31,4 +31,4 @@ def box_from_file(file,file_type=None,encoding='utf-8',errors='strict'): + if A.suffix in('.json','.jsn'):return _to_json(B) + if A.suffix in('.yaml','.yml'):return _to_yaml(B) + if A.suffix in('.tml','.toml'):return _to_toml(B) +- raise BoxError(f"Could not determine file type based off extension, please provide file_type") +\ No newline at end of file ++ raise BoxError(f"Could not determine file type based off extension, please provide file_type") +diff --git a/tests/test_cli.py b/tests/test_cli.py +index 9338851..726b009 100644 +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -11,7 +11,7 @@ from dynaconf.cli import main + from dynaconf.cli import read_file_in_root_directory + from dynaconf.cli import WRITERS + from dynaconf.utils.files import read_file +-from dynaconf.vendor.click.testing import CliRunner ++from click.testing import CliRunner + + + runner = CliRunner() + +base-commit: 952e713353356ea701196ac5ad204c72fd097e58 +-- +2.32.0 + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afece6381c..e938d27444 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -137,6 +137,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages django) #:use-module (gnu packages djvu) #:use-module (gnu packages docker) #:use-module (gnu packages enchant) @@ -12448,6 +12449,16 @@ text.") (home-page "https://pypi.org/project/colorama/") (license license:bsd-3))) +(define-public python-colorama-0.4.1 + (package (inherit python-colorama) + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "colorama" version)) + (sha256 + (base32 "0ba247bx5pc60hcpbf3rjsqk0whilg241i9qdfnlcwij5qgdgvh5")))))) + (define-public python2-colorama (package-with-python2 python-colorama)) @@ -26350,6 +26361,18 @@ graph can be output for rendering by GraphViz or yEd.") read key-value pairs from a .env file and set them as environment variables") (license license:bsd-3))) +(define-public python-dotenv-0.13.0 + (package (inherit python-dotenv) + (name "python-dotenv") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-dotenv" version)) + (sha256 + (base32 + "0x5dagmfn31phrbxlwacw3s4w5vibv8fxqc62nqcdvdhjsy0k69v")))))) + (define-public python-box (package (name "python-box") @@ -26373,3 +26396,74 @@ read key-value pairs from a .env file and set them as environment variables") "This package provides the @code{python-box} Python module. It implements advanced Python dictionaries with dot notation access.") (license license:expat))) + +(define-public dynaconf + (package + (name "dynaconf") + (version "3.1.4") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/rochacbruno/dynaconf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dafd7hb691g6s3yjfvl5gph5md73n6g9j44kjpbnbbilr5pc85g")) + (patches (search-patches "dynaconf-Unvendor-dependencies.patch")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove vendored dependencies + (let ((unvendor '("click" "dotenv" "ruamel" "toml"))) + (with-directory-excursion "dynaconf/vendor" + (for-each delete-file-recursively unvendor)) + (with-directory-excursion "dynaconf/vendor_src" + (for-each delete-file-recursively unvendor))))))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + (when tests? + (setenv "PATH" + (string-append (assoc-ref outputs "out") "/bin:" + (getenv "PATH"))) + ;; These tests depend on hvac and a + ;; live Vault process. + (delete-file "tests/test_vault.py") + (invoke "make" "test_only")) + #t))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-dotenv" ,python-dotenv-0.13.0) + ("python-ruamel.yaml" ,python-ruamel.yaml) + ("python-toml" ,python-toml))) + (native-inputs + `(("make" ,gnu-make) + ("python-codecov" ,python-codecov) + ("python-configobj" ,python-configobj) + ("python-colorama" ,python-colorama-0.4.1) + ("python-django" ,python-django) + ("python-flake8" ,python-flake8) + ("python-flake8-print" ,python-flake8-print) + ("python-flake8-todo" ,python-flake8-todo) + ("python-flask" ,python-flask) + ("python-future" ,python-future) + ("python-pep8-naming" ,python-pep8-naming) + ("python-pytest" ,python-pytest-6) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-forked" ,python-pytest-forked) + ("python-pytest-mock" ,python-pytest-mock) + ("python-pytest-xdist" ,python-pytest-xdist) + ("python-radon" ,python-radon))) + (home-page + "https://github.com/rochacbruno/dynaconf") + (synopsis + "The dynamic configurator for your Python Project") + (description + "This package provides @code{dynaconf} the dynamic configurator for +your Python Project.") + (license license:expat)))