From patchwork Sun Apr 23 13:11:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49446 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 CB75927BBEB; Sun, 23 Apr 2023 14:12:13 +0100 (BST) 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 82DEF27BBE2 for ; Sun, 23 Apr 2023 14:12:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqZVc-0004g6-58; Sun, 23 Apr 2023 09:12:04 -0400 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 1pqZVa-0004ef-J1 for guix-patches@gnu.org; Sun, 23 Apr 2023 09:12:02 -0400 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 1pqZVa-0006i1-8E for guix-patches@gnu.org; Sun, 23 Apr 2023 09:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqZVa-0007fJ-3a for guix-patches@gnu.org; Sun, 23 Apr 2023 09:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63026] [PATCH 0/2] Update gfeeds to 2.2.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2023 13:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andreas Enge Cc: 63026@debbugs.gnu.org, guix-devel@gnu.org Received: via spool by 63026-submit@debbugs.gnu.org id=B63026.168225549429425 (code B ref 63026); Sun, 23 Apr 2023 13:12:02 +0000 Received: (at 63026) by debbugs.gnu.org; 23 Apr 2023 13:11:34 +0000 Received: from localhost ([127.0.0.1]:44842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqZV8-0007eW-Ba for submit@debbugs.gnu.org; Sun, 23 Apr 2023 09:11:34 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:44264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqZV6-0007eI-FG for 63026@debbugs.gnu.org; Sun, 23 Apr 2023 09:11:33 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-94a342f7c4cso602086966b.0 for <63026@debbugs.gnu.org>; Sun, 23 Apr 2023 06:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682255486; x=1684847486; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:from:to:cc:subject:date:message-id:reply-to; bh=6zLwRuvorWVkvEk0heiw/ULADERr2X71aBz6x28q3vY=; b=siwa6SA7kkxYi8HfzUq0gmFV5qMWWAAhcuHUAG0GJInAJs9tRonwk3tI8JCBOh044e LERyA3/myhZJ6YsiEUUOUGWi7DQmPam+IfXhs6bewfRuK19c7Jk9cHhytOFUysdn/vFc GVO2vMgeuZWwpbYC7lX1ae5Q0ZAsMalQ6997tRCZjmZK7FWPUKn6OoGYWOLD1+9XCDjx h/ufSUF7Ga/B5v9ynx5hVH1w5F1PWv8YEkrEWr71qI4TMqz0EFe2YQTrgbAIOezxpfTP STltVD/GwQW/ahlyHvK4NTajptOHibIm2lWG+DGEsvQ8Nnu1clVKM0eSlo/go97SSH/C 6qmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682255486; x=1684847486; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6zLwRuvorWVkvEk0heiw/ULADERr2X71aBz6x28q3vY=; b=VquofKF3rbT2JyzsmnMQPajcJI9Wd348wX81Sv3UlEB+Ody8wXJmQEO+buxs5v5Oz/ yATBhpZ53xohLh5nrE8TsJ/funsQ2l26DcH61KGfTNqUdKbUJzWcOkdurmYcc7Kp9lap KOdpbryikc+X8sibunmDObSJKb2Z7AoEmhz4lPKZI1z/+m0Q8lK24zwOdabyT9e6zFkt d8ka15d5UKDFq+nMqE349Gs0a4Vy8YKCJdPg8gaLAhJPI4u3Mz8JxqKO1+OMiQO79mlH eF5CdnIBN1Tvncx70BmQALiPA2Ufgfc9noDqIim88fNyghWrg45cR8V9Iid/gQQSpyfJ q2FQ== X-Gm-Message-State: AAQBX9dbXgzI4kf8ePGChb08ERh6fRu5Zx2jNpcTPM68Sge5GXx5ju5Q q4jDZtyDEIfoP0CMLstrKUs= X-Google-Smtp-Source: AKy350a0rrTHIJuqL3/KLZEsqt4bbiKCo5gQJ9GKu2dAr3hEbCjtWa/fVBc8JTT6K14m5wdc2X3HSQ== X-Received: by 2002:a17:907:d307:b0:94f:396d:dd32 with SMTP id vg7-20020a170907d30700b0094f396ddd32mr7238685ejc.21.1682255486455; Sun, 23 Apr 2023 06:11:26 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s2-20020a1709064d8200b0094a86ccb634sm4342697eju.210.2023.04.23.06.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 06:11:25 -0700 (PDT) Message-ID: <409a1b9a4f5484ff1dfec28e1982f76ef2b07959.camel@gmail.com> From: Liliana Marie Prikler Date: Sun, 23 Apr 2023 15:11:24 +0200 In-Reply-To: References: User-Agent: Evolution 3.46.4 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 Am Sonntag, dem 23.04.2023 um 09:07 +0200 schrieb Andreas Enge: > Hello Liliana, > > Am Sun, Apr 23, 2023 at 01:45:19AM +0200 schrieb Liliana Marie > Prikler: > > as with the recent update to Evolution, this is an update to get a > > package into a working state again. > > gfeeds has python-magic as input, which fails on the soon to be > merged core-updates. It would be interesting if you could have a look > at this package. Thanks! Patch is attached. Cheers From 7c2b2abd1b6168941a102ac30581bb607c841bd8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 23 Apr 2023 15:07:39 +0200 Subject: [PATCH core-updates] gnu: python-magic: Update to 0.4.27. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/python-magic-python-bytecode.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/python-xyz.scm (python-magic): Update to 0.4.27. [source]: Remove field. [#:phases]: Do not invoke ‘tests.py’. --- gnu/local.mk | 1 - .../python-magic-python-bytecode.patch | 19 ------------------- gnu/packages/python-xyz.scm | 6 ++---- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 gnu/packages/patches/python-magic-python-bytecode.patch diff --git a/gnu/local.mk b/gnu/local.mk index a2b7defe30..fcb3acd212 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1774,7 +1774,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyflakes-test-location.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ - %D%/packages/patches/python-magic-python-bytecode.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-parso-unit-tests-in-3.10.patch \ diff --git a/gnu/packages/patches/python-magic-python-bytecode.patch b/gnu/packages/patches/python-magic-python-bytecode.patch deleted file mode 100644 index 997fb4ee5a..0000000000 --- a/gnu/packages/patches/python-magic-python-bytecode.patch +++ /dev/null @@ -1,19 +0,0 @@ -File 5.41 changed the MIME type of Python bytecode; adjust accordingly. - -Taken from upstream: - - https://github.com/ahupp/python-magic/commit/0ae7e7ceac0e80e03adc75c858bb378c0427331a - -diff --git a/test/test.py b/test/test.py -index 0c4621c..e443b84 100755 ---- a/test/test.py -+++ b/test/test.py -@@ -90,7 +90,7 @@ def test_mime_types(self): - try: - m = magic.Magic(mime=True) - self.assert_values(m, { -- 'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python'), -+ 'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python', 'application/x-bytecode.python'), - 'test.pdf': 'application/pdf', - 'test.gz': ('application/gzip', 'application/x-gzip'), - 'test.snappy.parquet': 'application/octet-stream', diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c623ce3135..685e1df38f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16863,17 +16863,16 @@ (define-public python-textual (define-public python-magic (package (name "python-magic") - (version "0.4.24") + (version "0.4.27") (home-page "https://github.com/ahupp/python-magic") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "python-magic-python-bytecode.patch")) (sha256 (base32 - "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0")))) + "1x11kfn4g244fia9a7y4ly8dqv5zsxfg3l5azc54dl6gkp2bk7vx")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -16895,7 +16894,6 @@ (define-public python-magic (setenv "LC_ALL" "en_US.UTF-8") (if tests? (with-directory-excursion "test" - (invoke "python" "./test.py") (invoke "python" "./libmagic_test.py")) (format #t "test suite not run~%"))))))) (native-inputs -- 2.39.2