From patchwork Sat Dec 3 09:31:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 8064 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 E155227BBE9; Sat, 3 Dec 2022 10:02:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E1A927BBEC for ; Sat, 3 Dec 2022 10:02:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1PKc-0004l0-4l; Sat, 03 Dec 2022 05:01:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p1PKY-0004i4-H8 for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p1PKY-0001cp-6T for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1PKQ-0007OY-1K for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59798] [PATCH 2/6] gnu: Add python-omegaconf. References: <844eb869ce6d4bf984242268b254eeba522d2f9d.camel@gmail.com> In-Reply-To: <844eb869ce6d4bf984242268b254eeba522d2f9d.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Dec 2022 10:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59798@debbugs.gnu.org Received: via spool by 59798-submit@debbugs.gnu.org id=B59798.167006161428281 (code B ref 59798); Sat, 03 Dec 2022 10:01:01 +0000 Received: (at 59798) by debbugs.gnu.org; 3 Dec 2022 10:00:14 +0000 Received: from localhost ([127.0.0.1]:51468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJd-0007M4-IO for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:13 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:42641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJa-0007KT-6u for 59798@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:12 -0500 Received: by mail-ej1-f66.google.com with SMTP id n21so16829322ejb.9 for <59798@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=hGw9iyb5WpPIWq3LkJG2PpQW8JmHtOlq4CxSy4Nt2lo=; b=MPkn3HX3eH4qIjlXcyz6h7hDCV92Qx0iz62qC6oXvTelZShF0lXyTQ0wGLglMM1bpJ i9P+mSr4YuUUjOnIP7EgjczGwrxMM+oYUUOKcLGbgWJiaN21QbJpUTkMo/O/egpoPK5+ g60XTOU2Il0N29didQumqIktRZyMl26+BIqJeF0hFXNviXZuUjC2uQq+GuskRh8va6+q BbsqX5yHzbisGOzFbktKNQI77c9aNLhGN4jmT8Qy3r+nrQ8IgTjGBam9RoZVMH74fOlB UgYfMuX7wtrFAg33nrfoBafO8dbC+r8qHxycHgTT4FA/xAS6LOMLSHkaOAWdBBJiT6BR g2fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hGw9iyb5WpPIWq3LkJG2PpQW8JmHtOlq4CxSy4Nt2lo=; b=frogtTsRJDfdXlkZN93PY1zWzyDH+igKswx76jqxhiYpWVLBz/dY6ZWXhIGkY8JLt6 T0S2if1JvlwUx6kKsddBnKB34fYiusc15ztTjI4YxwYqfbu2g64xWKx01UZXyLHp3T90 +pD3DnwL0MbahjHPxTuXcN9kOppTueLcQhgJmWFDai/xuXZ9YrQJ6obq22xBhgHBYqDv DSrORpjXHl9E/5rwcRHpswINtxiD/89+c2nUSHxf9cir+2GxlUIljgfFOnY0MQ2lQjRj avOfIpN6u1evPj3QYKdj/7sPT4c60qinRtnLEnH0QDBaTqy6Gql8NwR5/9kkEXV7W7+v dwdw== X-Gm-Message-State: ANoB5pl5kvs9tFt2TMqjhK8pAEEpHZgr6H40riBpDsMHKfshQ7DBJEaJ 18P/rBiQRvWeRSkbEdc6RI1NBQl/fTo= X-Google-Smtp-Source: AA0mqf5sX4zX13yoQWsAnLrwZmCBupa/IcAcrfBZoGrK6koWOJEAq52GRRjhWKTAl1bbuEjIdlawXA== X-Received: by 2002:a17:906:3496:b0:7c0:c709:be3a with SMTP id g22-20020a170906349600b007c0c709be3amr4812656ejb.87.1670061604601; Sat, 03 Dec 2022 02:00:04 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q2-20020a17090676c200b00770812e2394sm3974731ejn.160.2022.12.03.02.00.04 for <59798@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:04 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:31:42 +0100 Message-ID: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-omegaconf): New variable. --- gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 40c3f9c99c..49f551e35a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -193,6 +193,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages java) #:use-module (gnu packages jupyter) #:use-module (gnu packages kerberos) #:use-module (gnu packages libevent) @@ -14353,6 +14354,46 @@ (define-public python-configobj (home-page "https://github.com/DiffSK/configobj") (license license:bsd-3))) +(define-public python-omegaconf + (package + (name "python-omegaconf") + (version "2.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/omry/omegaconf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet #~(begin + (delete-file-recursively "build_helpers/bin") + (substitute* "build_helpers/build_helpers.py" + (("java") "antlr4") + (("\"-jar\",") "") + (("str\\(build_dir / \"bin\" / \"antlr.*\"\\),") "")))) + (sha256 + (base32 + "00rw1rkjycn0jdg3jmar6jdxb1pcb21jclm5g1921s9z8f5ii5dh")))) + (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirements + (lambda _ + (substitute* "requirements/base.txt" + (("antlr4-python3-runtime==") + "antlr4-python3-runtime>="))))))) + (propagated-inputs (list java-antlr4-runtime-python + python-pydevd + python-pyyaml)) + (native-inputs (list icedtea antlr4 python-pytest python-pytest-mock)) + (home-page "https://github.com/omry/omegaconf") + (synopsis "Flexible configuration system") + (description "OmegaConf is a hierarchical configuration system and +supports merging configurations from multiple sources. It provides a +consistent API regardless of how the configuration was created.") + (license license:bsd-3))) + (define-public python-configargparse (package (name "python-configargparse")