From patchwork Sat Dec 3 09:29:50 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: 45034 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 3D01427BBE9; Sat, 3 Dec 2022 10:02:07 +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=ham 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 9B9E427BBEB for ; Sat, 3 Dec 2022 10:02:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1PKb-0004jQ-Gn; Sat, 03 Dec 2022 05:01:13 -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 1p1PKX-0004gS-Om for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:09 -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 1p1PKX-0001bj-DL for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1PKQ-0007Oe-Dq for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59798] [PATCH 1/6] gnu: Add java-antlr4-runtime-python. 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:02 +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.167006161428292 (code B ref 59798); Sat, 03 Dec 2022 10:01:02 +0000 Received: (at 59798) by debbugs.gnu.org; 3 Dec 2022 10:00:14 +0000 Received: from localhost ([127.0.0.1]:51470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJd-0007M6-ST for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:14 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:47098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJZ-0007KS-UR for 59798@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:12 -0500 Received: by mail-ed1-f68.google.com with SMTP id c17so901083edj.13 for <59798@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:09 -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=fT6+MsL5P7v5OMwuKRjbKZJxXWS4q5iSyBzTnmsGHMc=; b=P1AAo1fGY/RdWpgI/Jt8ZH6U0K4m3NPlHc6XqqbF/nLcu4HCoRzzy5+qRUgy0Ic6lh fvMJPLVpmfKMJT2VcEbTlt4yQc87vWLhK4Qd8vTjGNS4KyD79eCUq6sRV3MnBYFPlkZw f9M0UOGo1k30zwRzMI2Ii0HjhVd6LC+17j0D2iQHnbKR80Pj8cNIMSAWHIvU+J8+onh8 Co7VDVRXlmPZtxGwJTeiB9Wo2p8gE10stUgvcTbA16CMAL/W79luJzDz0fBM1HeF0uot C6aaFuT9Mbx5aukX/fsdHTEYnDNP6rGwnCwG7qG0Q2yphPU19a8jsxMxJ6gdo9JDsOvV GErQ== 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=fT6+MsL5P7v5OMwuKRjbKZJxXWS4q5iSyBzTnmsGHMc=; b=J4cCH74IsHc6yfLOHafJX4cZY4drCoQ04KdqbMhnrIlk+PGHVRD42c2g7f42FNTZnE 4aODVs1Qc/pU15BCj25jY6SDV001kcDKAL7IpwVCgd/G5F160+oCh+p/I9uscWl4Z0IB gFhoRJ1NwowDepQU2WhM24sCW1ul9clXaeYjm5SnREGt6p8NYk56MH4pFgZlCIK0pdGZ PYL/6jySpU83vQ265EWpKKoRFBXGXxd/DwVCBFUfzh6zEQoG0sO9SfdK1GAlpNuxeNP/ ArSZu7xz9j38UQAiXswLHavNc+YNa5gzoEq188eMG41e4NJPuasJqQT1hqsQztezgE/Q qc0g== X-Gm-Message-State: ANoB5pnHBLT15abl6bYdDhXsLL1AY4Bdwki5DSQXfkPI6wEZPHORXUvA BH1zzbviJczLF7zWEYMAWsk5H/p9OLs= X-Google-Smtp-Source: AA0mqf58hGehQ0DVtvFnLt6sYI5KHgosY8MU9+D/GqSlHwTRtriSkvvRJce7OTqQQp6I7enouOOUKg== X-Received: by 2002:a05:6402:6c6:b0:46c:1326:e186 with SMTP id n6-20020a05640206c600b0046c1326e186mr6955585edy.228.1670061603976; Sat, 03 Dec 2022 02:00:03 -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.03 for <59798@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:03 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:29:50 +0100 Message-ID: <40114e332a3f4398d0bb08cf6db3d17090d79839.camel@gmail.com> 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/java.scm (java-antlr4-runtime-python): New variable. --- gnu/packages/java.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f80406cab9..bc6e7057cb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -49,6 +49,7 @@ (define-module (gnu packages java) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system maven) + #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages attr) @@ -8694,6 +8695,26 @@ (define-public java-antlr4-runtime-cpp (description "This package contains the C++ runtime library used with C++ generated sources by ANTLR."))) +(define-public java-antlr4-runtime-python + (package + (inherit java-antlr4-runtime) + (name "java-antlr4-runtime-python") + (outputs '("out")) + (build-system python-build-system) + (arguments + (list + #:tests? #f ; tests require antlr + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "runtime/Python3")))))) + (native-inputs (list pkg-config)) + (inputs (list `(,util-linux "lib"))) ; libuuid + (synopsis "ANTLR Python runtime library") + (description "This package contains the Python runtime library used with +Python generated sources by ANTLR."))) + (define-public antlr4 (package (inherit java-antlr4-runtime) 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: 45032 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") From patchwork Sat Dec 3 09:36:25 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: 45035 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 7E41E27BBEC; Sat, 3 Dec 2022 10:02:15 +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=ham 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 1B7B427BBE9 for ; Sat, 3 Dec 2022 10:02:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1PKg-0004qp-SA; Sat, 03 Dec 2022 05:01:18 -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 1p1PKa-0004jL-SC for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:13 -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 1p1PKa-0001dn-Dd for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1PKR-0007Oq-8b for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59798] [PATCH 3/6] gnu: python-iso3166: Update to 2.1.1. 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:03 +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.167006161628313 (code B ref 59798); Sat, 03 Dec 2022 10:01:03 +0000 Received: (at 59798) by debbugs.gnu.org; 3 Dec 2022 10:00:16 +0000 Received: from localhost ([127.0.0.1]:51474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJf-0007MW-Vj for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:16 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:36441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJa-0007KU-Pc for 59798@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:13 -0500 Received: by mail-ej1-f67.google.com with SMTP id ha10so16895353ejb.3 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=p8uF3R0FUyi0E1Znre+Pb+hYpMT1ix94JvQ+97rLHSM=; b=Whk57cecJR5zywADfBow0U42bgLN2JS1ntMvdvFL4uVU5rtvDRBeKkz52rr8trnnOa WLv+YLSJzAEqIQlWjDBC5z4+aPJTSqSeyrhCTP9+OtXXGm6GxM5NbxVL834nlElQWmga LFqaSxqt4I99XN/59JtRRueJ1OFFo3OtDxH3Ld9dsVMnIZV9dDZk8qlBCTFP1u6DxDpK QHILMszhZp6yIQd4qiNanLHeYqboXSTisOkQ3z48vyHPphpqu9BfyZmOsMbvXfry8UuT s3OsGffDnDuAeCIVPUG05b9Uty7rTGonCys1y3w8sfCSwZCqC7MnF0866ClRlBaXWmRI 5WIg== 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=p8uF3R0FUyi0E1Znre+Pb+hYpMT1ix94JvQ+97rLHSM=; b=sYyiMDEZGsaaGHL/ZiKH/V5EQj/Ri3tdIBV/JtDuQqxmJE1gmnJjw6fZv9pmWGF3VL 24wzYdRCv93u+7xKLOt4C+KtcA1rg6uINEVA489EkQR8fF1GuZi0zivpVdbB29qonBJE lRbtvRSfFMrxPG/N9zdcoVrUWf9PJt27bD0aQb9fhcBVll/6UZZt/nMTuYa7R9RSVNYq Ph/ACFfLky/Gz5RbbxOyeRFMRJRkoGkuR9G7/UG+FApfmXHRiMkW8YG23q52ClCEDw22 J68cvj9C4bTXFkG+v19HOJO/S+HeTiWeXIYyCAWz7cdzwKN/Ap3ghvPJjUWc5/cwhD2+ nn2w== X-Gm-Message-State: ANoB5pmr+RydZpSLXP/k1CoN/O3FC9zAp1XqzDlyrYI2o5s92so8g5+o GL5Hp5lnZCU0O1uNO/lkMxeuhQZ60RI= X-Google-Smtp-Source: AA0mqf4iaEVtjxN64x5yN9vsX2hxBqnFnC6QBARMIAdBWXws+5dWNFbOSClFX/M/K/yLMzoxeNnZKw== X-Received: by 2002:a17:906:1484:b0:7ae:6746:f270 with SMTP id x4-20020a170906148400b007ae6746f270mr12855006ejc.728.1670061605259; Sat, 03 Dec 2022 02:00:05 -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:36:25 +0100 Message-ID: <374e36f2945cdcaf9c4ba1d7d0afc3fac33e92d2.camel@gmail.com> 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/iso-codes.scm (python-iso3166): Update to 2.1.1. --- gnu/packages/iso-codes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm index 95ab9ca44f..d2bace6a3c 100644 --- a/gnu/packages/iso-codes.scm +++ b/gnu/packages/iso-codes.scm @@ -109,14 +109,14 @@ (define-public python-iso639 (define-public python-iso3166 (package (name "python-iso3166") - (version "0.9") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "iso3166" version)) (sha256 (base32 - "0hm0xm30sprk1jssmn4cqks0x3nx5fp8r5ypvahcysmmayzrsnjl")))) + "068p94gavc8gbmp5a2kw8hi5l551wfzbpmp6z7ll8sx6vnw53mgw")))) (build-system python-build-system) (home-page "https://github.com/deactivated/python-iso3166") (synopsis "Self-contained ISO 3166-1 country definitions") From patchwork Sat Dec 3 09:40:08 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: 45030 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 1945927BBF0; Sat, 3 Dec 2022 10:02:02 +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,URIBL_BLOCKED autolearn=ham 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 5D85527BBE9 for ; Sat, 3 Dec 2022 10:02:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1PKb-0004iY-FT; Sat, 03 Dec 2022 05:01:13 -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-0004hA-6h 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 1p1PKX-0001bl-RY for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1PKQ-0007Ok-Rf for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59798] [PATCH 4/6] gnu: Add python-commonroad-vehicle-models. 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:02 +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.167006161628307 (code B ref 59798); Sat, 03 Dec 2022 10:01:02 +0000 Received: (at 59798) by debbugs.gnu.org; 3 Dec 2022 10:00:16 +0000 Received: from localhost ([127.0.0.1]:51472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJf-0007MP-JN for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:15 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:34815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJb-0007KV-De for 59798@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:12 -0500 Received: by mail-ej1-f66.google.com with SMTP id o13so16879806ejm.1 for <59798@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:11 -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=HH5hzfm+q4lHTyg7zf9J+gPsZGl4wipMh52EYxmrZ+E=; b=RxyfALkGnsuk+QkPXhon9GXm3UC8tNLRKc60KoVQyGZX6dm11Nhj/f94CHubc74wpO NqW4NhvW6lLXkjPYY1w3Y7OGzzvixMrAhZN9ZhAanv4pOFF1n7qP0ykx8hVhGI8LYZ+m jKT1H9g6DJiElWVt2Noau8nQFzya85naU2pGZtXXXw8EwYApi33g4MeGSJTk0erI0a2A aJC916+6nbbwmwHsZDQMC2Ws6QjucyQ1PeYIuqBimt8HgCTyTQGRONaFpg6xB25uolUS JYwIz4CHyErvfllZ2CRYLgIZ6oR3gNZAkfyBFFmqx1fDDmM5ziwDgaUHKNU7u6aDICD+ ojWg== 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=HH5hzfm+q4lHTyg7zf9J+gPsZGl4wipMh52EYxmrZ+E=; b=edtxZw2cFKnUMc7uS+9+0SuAMlHmeq1+8MEz4GC5Z+PY6y+kNuQKurckJc8ZJBF9MF ARxxda/VRjAmGkwXpX8NxziMb9dp/0pP0jGKPCdQlUSFPsSyaB1zVn+wPX/QiPSaRzUh wCoLVPZxndhmY9sbn8GHR3r/i1CRKa3LAuscW+Fkfy1W25uGoFrONalNPvFqIUTU4H+D UOc+Vqhzjp93b5LqDU7v18okmOsulTsj6mRVFvCipMQfHpkcXss6Pw1DlGnW64KsJugJ CKFNeoGUWbD9/0L9X6KMaX+5ITATbAg9Asc+o/lbhhmrzWLZV5c6oRAXtW0ktz9CK9GS W4EQ== X-Gm-Message-State: ANoB5pl+bahO7Rg0QiFEf7CrK0Hxv2tw6uRIocX46efd71Lm8agvCP9L f0NOTKP+9B4j+AQBnqukuxbIVTmHdS4= X-Google-Smtp-Source: AA0mqf6C+uePOfBdQKxgQjpbCdGd/Go5BDt8xJgvnWh5vM42tTT/rNr69vE+0AhrZBfq4XayZ4UuhQ== X-Received: by 2002:a17:906:b103:b0:7c0:9a2e:2840 with SMTP id u3-20020a170906b10300b007c09a2e2840mr14450336ejy.404.1670061605874; Sat, 03 Dec 2022 02:00:05 -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.05 for <59798@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:05 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:40:08 +0100 Message-ID: <33a0b9ce359e80fd45eb4a6d35f6455e4f04f2ee.camel@gmail.com> 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/simulation.scm (%commonroad-dont-install-license-at-root) (python-commonroad-vehicle-models): New variables. --- gnu/packages/simulation.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 256e404970..07f1f879f9 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -936,6 +936,36 @@ (define-public python-dolfin-adjoint @url{https://firedrakeproject.org,firedrake}.") (license license:lgpl3))) +(define %commonroad-dont-install-license-at-root + #~(substitute* "setup.py" + (("data_files=\\[\\('.', \\['LICENSE.txt'\\]\\)\\],") + ""))) + +(define-public python-commonroad-vehicle-models + (package + (name "python-commonroad-vehicle-models") + (version "3.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "commonroad-vehicle-models" version)) + (sha256 + (base32 + "13jg0cys7y4n7rg548w6mxk9g10gd5qxmj4ynrlriczpffqy6kc7")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-setup.py + (lambda _ + #$%commonroad-dont-install-license-at-root))))) + (propagated-inputs (list python-numpy python-omegaconf)) + (home-page "https://commonroad.in.tum.de/") + (synopsis "CommonRoad vehicle models") + (description "This package provides vehicle models used in CommonRoad +benchmarks. Varying abstraction levels are used ranging from kinematic single +track models to multi-body models.") + (license license:bsd-3))) + (define-public sumo (package (name "sumo") From patchwork Sat Dec 3 09:43:01 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: 45025 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 9FA1F27BBEC; Sat, 3 Dec 2022 10:01:16 +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,URIBL_BLOCKED autolearn=ham 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 BDD4627BBE9 for ; Sat, 3 Dec 2022 10:01:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1PKY-0004iS-Su; Sat, 03 Dec 2022 05:01:10 -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 1p1PKX-0004gT-Oj for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:09 -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 1p1PKX-0001bi-FM for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1PKS-0007P2-6T for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59798] [PATCH 5/6] gnu: Add python-commonroad-io. 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:04 +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.167006161828327 (code B ref 59798); Sat, 03 Dec 2022 10:01:04 +0000 Received: (at 59798) by debbugs.gnu.org; 3 Dec 2022 10:00:18 +0000 Received: from localhost ([127.0.0.1]:51478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJh-0007Mk-Km for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:18 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJc-0007KW-0m for 59798@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:15 -0500 Received: by mail-ed1-f68.google.com with SMTP id a16so9410518edb.9 for <59798@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:11 -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=NqJDnWlHrIhSkV5ejv/v5Yyyj5b3ZdYGh1gG/D8rpLc=; b=Sy0SCC2r3y4goM0HKCMODTX1CChLoCjQqfrfynO/CxJRa7PYCFmumlHvXIUeFKlNf/ yqS/9Ra+KCCBtA6EtDb5Y+DAK5iO+dQOUnS+RSGHUwD/Z/uHCGrHQnazqQXodec1D3oP sQYSwqRNEitDFPjUVWbdd7cm6b8KfjoJlXNElZk1LLssBpg73th53fJMAHOgv6W1ETFG UzWPbwZhoF45A4vPHI1MpGMVICbuBuriCLpk8ASrkewAz8gNgHwNQEnYK2phuY3NiSNA C3mUZ/kg7hLDItFl77CtV8ok5BQUmfEkD++0xjMsX8LMQP93zpnRkwWFao76+ys7GEzb dlRg== 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=NqJDnWlHrIhSkV5ejv/v5Yyyj5b3ZdYGh1gG/D8rpLc=; b=E9juRWmg8rF2ZjoCmSexQKpYCrjU5njaBH0+m7VNiykif9U7isSy6gxrut/EMA0fy5 EjzwkmaBnO3WYMJ2bxCmbIhQVsej/axsfPrUlMJXnvjAXzlFUyHBs2IyqGAXoXwshUyu xnJK9AAWz8pv2OIbjR11Sq+scqitIN6D8TKAdAEMJOPjmVO0IwWPqzZFdhcvlJOv795B 4YoCB7ekvb2la2noSd0Z8OW1SjM2bQfLLA1mR9cBqWvCgFtZyg9dq+qOszd5ZdUD3yVm x3s7flsXfPCUUjoh7QUhDW98DtEAvvd+1EmpB9dTEjk5q2dxF+loufT9nwLwgkV7ZEvO Biig== X-Gm-Message-State: ANoB5pnQ4iQhjC1bXXvN0e3Y5JtmBTu0OHpw7dWCHOGvL25Hpjf059QQ 9dwxA1mTfvVal3RNm0wqBtNa6YZdHJ0= X-Google-Smtp-Source: AA0mqf7UlkGrSNfJV6d7nmlAbONlU4GAKFlUflVl4fj7xZiR/pkZh11tO9eMDiW6hVTIaICJiukI0w== X-Received: by 2002:aa7:c94a:0:b0:46b:74e1:872c with SMTP id h10-20020aa7c94a000000b0046b74e1872cmr19140564edt.301.1670061606527; Sat, 03 Dec 2022 02:00:06 -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.05 for <59798@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:06 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:43:01 +0100 Message-ID: <3ca0ed5fc56c6708cb764f1d48e1291738d6052c.camel@gmail.com> 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/simulation.scm (python-commonroad-io): New variable. --- gnu/packages/simulation.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 07f1f879f9..7659cf224a 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -40,6 +40,7 @@ (define-module (gnu packages simulation) #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages iso-codes) #:use-module (gnu packages linux) #:use-module (gnu packages m4) #:use-module (gnu packages maths) @@ -47,6 +48,7 @@ (define-module (gnu packages simulation) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-science) @@ -966,6 +968,45 @@ (define-public python-commonroad-vehicle-models track models to multi-body models.") (license license:bsd-3))) +(define-public python-commonroad-io + (package + (name "python-commonroad-io") + (version "2022.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "commonroad-io" version)) + (sha256 + (base32 + "1cj9zj567mca8xb8sx9h3nnl2cccv6vh8h73imgpq61cimk9mvas")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-setup.py + (lambda _ + #$%commonroad-dont-install-license-at-root))))) + (propagated-inputs (list python-commonroad-vehicle-models + python-iso3166 + python-lxml + python-matplotlib + python-networkx + python-numpy + python-omegaconf + python-pillow + python-protobuf + python-rtree + python-scipy + python-shapely + python-tqdm)) + (native-inputs (list python-lxml python-pytest)) + (home-page "https://commonroad.in.tum.de/") + (synopsis "Read, write, and visualize CommonRoad scenarios.") + (description "This package provides methods to read, write, and visualize +CommonRoad scenarios and planning problems. It can be used as a framework for +implementing motion planning algorithms to solve CommonRoad Benchmarks +and is the basis for other tools of the CommonRoad Framework") + (license license:bsd-3))) + (define-public sumo (package (name "sumo") From patchwork Sat Dec 3 09:43:08 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: 45031 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 3130427BBE9; Sat, 3 Dec 2022 10:02:03 +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,URIBL_BLOCKED autolearn=ham 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 A38A327BBEC for ; Sat, 3 Dec 2022 10:02:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1PKg-0004qP-Gs; Sat, 03 Dec 2022 05:01:18 -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-0004hS-A5 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 1p1PKX-0001cH-To for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1PKR-0007Ow-OA for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59798] [PATCH 6/6] gnu: Add python-commonroad-route-planner. 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:03 +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.167006161728321 (code B ref 59798); Sat, 03 Dec 2022 10:01:03 +0000 Received: (at 59798) by debbugs.gnu.org; 3 Dec 2022 10:00:17 +0000 Received: from localhost ([127.0.0.1]:51476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJh-0007Mi-A7 for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:17 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:41872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PJc-0007Kw-Oi for 59798@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:14 -0500 Received: by mail-ed1-f67.google.com with SMTP id m19so9413125edj.8 for <59798@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:12 -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=IggAKX5vXK9lh3/vI22Ki0jFA5fG+4hKAssustjBQLE=; b=JHmNbFoMekbWIOlkoMHuBHnDgeDul4hbIjKXtPYQotQ0XgX1bFK6iDa3Mgo3CZHE7v xmL9nlMU7TuTRMB5/WRQ1f7tMJff1+DncjHaHkD0bQiX6WoPghKzBCEC//Ax0tuTtHRw WsU6p+vKjaoOKOMdxRCbrluY+9b/JIlNzw0NRh6GHpV+ZMAOQiKPg2sDDHwb2cY70WGg 7tcwBo6RR1b9hEfsBHl8x1EwRQaRsChiuYECiUIL50Aime6EODrtpxA6IfbD9IVixTSq KdmboZLwzOMLXmQT10J5AFSsCW7SnOCNhIShLXM87KDRzP2CYOazVFZ47VlDKGZbiIxH wDpQ== 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=IggAKX5vXK9lh3/vI22Ki0jFA5fG+4hKAssustjBQLE=; b=vTlayjs1PSLhzUslWW+no+uxiw/0bArFz/JyW+2+9TzCg0CN8sVCDTpFG2JSS4TCd/ r6S+164HdLY0W+peaffafEQJt11E9ER16cixjWEharcmzS+jzXOSrrGvJsgPDyHkLKpv qnUQR3Kk2e3EMr8S20zAgnQyPqOXFYvrqh4qGKd10lN9M2u7sJT6A6gIY9pGsa1zztzw 5nOzoj9BIjbSL6glA+5OORKRcuuOI5sI27CKS3r46SuLsfPYyYp7IcW50SPJVjzuoX67 Ww4btGAFC7YguIkpt7WZ2igBesRMQls/XOV0/yadGiZ9UKimeUZ0bxeq1T02x0/U5D5C daow== X-Gm-Message-State: ANoB5pkZXNAXJmApeC1OtYB7GnD6FMYX1p4/KeT1DOLnY/N4sm7CA5rU KAg+MzaKY73yO22b6MemrjLxHH1KBPc= X-Google-Smtp-Source: AA0mqf5MSBXsFUJ5BHu804q8Ni2HaEiVV91eOP3QO4Qk+eCk2Skjyfoy7c3cfqZFeGNVqgjkLunwrQ== X-Received: by 2002:aa7:cb03:0:b0:46a:a12a:4dcd with SMTP id s3-20020aa7cb03000000b0046aa12a4dcdmr38113080edt.338.1670061607160; Sat, 03 Dec 2022 02:00:07 -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.06 for <59798@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:06 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:43:08 +0100 Message-ID: <11be62f160fc0150579c571e512c80a08433ba85.camel@gmail.com> 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/simulation.scm (python-commonroad-route-planner): New variable. --- gnu/packages/simulation.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 7659cf224a..762cfc2b84 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -1007,6 +1007,39 @@ (define-public python-commonroad-io and is the basis for other tools of the CommonRoad Framework") (license license:bsd-3))) +(define-public python-commonroad-route-planner + (package + (name "python-commonroad-route-planner") + (version "2022.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.lrz.de/tum-cps/commonroad-route-planner") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xn0l7bzmj56d4mlqacvbl8mdvsffkg2fn2lzfmis5jl4vp99ipf")))) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-setup.py + (lambda _ + #$%commonroad-dont-install-license-at-root))))) + (build-system python-build-system) + (propagated-inputs (list python-commonroad-io + python-matplotlib + python-networkx + python-numpy + python-setuptools + python-shapely)) + (home-page "https://gitlab.lrz.de/tum-cps/commonroad-route-planner") + (synopsis "Route planner for CommonRoad scenarios") + (description "This package provides functions for route planning, that is +finding sequences that lead from a given start lanelet to some goal +lanelet(s).") + (license license:bsd-3))) + (define-public sumo (package (name "sumo")