[bug#63026] [PATCH 0/2] Update gfeeds to 2.2.0.

[bug#63026] [PATCH 0/2] Update gfeeds to 2.2.0.

[Liliana Marie Prikler]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

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

[-- Attachment #2: 0001-gnu-python-magic-Update-to-0.4.27.patch --]
[-- Type: text/x-patch, Size: 3959 bytes --]

From 7c2b2abd1b6168941a102ac30581bb607c841bd8 Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
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]<patches>: Remove field.
[#:phases]<check>: 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

[bug#63026] [PATCH 0/2] Update gfeeds to 2.2.0.

[Andreas Enge]

Am Sun, Apr 23, 2023 at 03:11:24PM +0200 schrieb Liliana Marie Prikler:
> > 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.

Thanks! I took the liberty to push the python-magic patch to core-updates;
it might also enable the trytond set of packages to build (I checked trytond
itself). The other patch does not apply to core-updates; I let you update
it and push it at your convenience to core-updates or after the merge to
master. As no other package depends on it, it is safe.

Andreas

[bug#63026] [PATCH 0/2] Update gfeeds to 2.2.0.

[Liliana Marie Prikler]

Am Montag, dem 24.04.2023 um 10:37 +0200 schrieb Andreas Enge:
> The other patch does not apply to core-updates; I let you update
> it and push it at your convenience to core-updates or after the merge
> to master. As no other package depends on it, it is safe.
It is intended for current master, perhaps that's causing some issue.
Do we have an ETA for core-updates?

[bug#63026] [PATCH 0/2] Update gfeeds to 2.2.0.

[Andreas Enge]

Am Mon, Apr 24, 2023 at 06:47:49PM +0200 schrieb Liliana Marie Prikler:
> It is intended for current master, perhaps that's causing some issue.
> Do we have an ETA for core-updates?

It is supposed to be merged tomorrow, but since gfeeds has no dependents,
you can push it any time (before the merge to core-updates, or after the
merge to master). There is not much use in pushing it to master today
if we already know it will break with the merge tomorrow...

Andreas

bug#63026: [PATCH 0/2] Update gfeeds to 2.2.0.

[Liliana Marie Prikler]

Am Montag, dem 24.04.2023 um 18:56 +0200 schrieb Andreas Enge:
> It is supposed to be merged tomorrow, but since gfeeds has no
> dependents, you can push it any time (before the merge to core-
> updates, or after the merge to master). There is not much use in
> pushing it to master today if we already know it will break with the
> merge tomorrow...
Given that gfeeds already had an unclean upgrade on core-updates, I
simply fixed the build on the now-merged master and pushed that.

Thanks & cheers

[bug#63026] [PATCH 0/2] Update gfeeds to 2.2.0.

[Liliana Marie Prikler]

Hi Guix,

as with the recent update to Evolution, this is an update to get a
package into a working state again.

Cheers

(Sorry for the first mail being sent to guix-devel by mistake.)

Liliana Marie Prikler (2):
  gnu: syndication-domination: Update to 1.0-1-7592032.
  gnu: gfeeds: Update to 2.2.0.

 gnu/local.mk                                  |  1 +
 .../patches/gfeeds-python-39-compat.patch     | 82 +++++++++++++++++++
 gnu/packages/syndication.scm                  | 18 ++--
 3 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/gfeeds-python-39-compat.patch

-- 
2.39.2