public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/python-magic/, dev-python/python-magic/files/
@ 2023-06-24  6:43 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2023-06-24  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     9f0be9f1391414bbb13ae7987d01d21ef2d1161f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 06:35:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 06:35:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f0be9f1

dev-python/python-magic: backport test (only) fix, enable py3.12

Closes: https://bugs.gentoo.org/892379
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/python-magic-0.4.27-fix-gzip-test.patch  | 26 ++++++++++++++++++++++
 dev-python/python-magic/python-magic-0.4.27.ebuild |  6 ++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/dev-python/python-magic/files/python-magic-0.4.27-fix-gzip-test.patch b/dev-python/python-magic/files/python-magic-0.4.27-fix-gzip-test.patch
new file mode 100644
index 000000000000..9a978146f32d
--- /dev/null
+++ b/dev-python/python-magic/files/python-magic-0.4.27-fix-gzip-test.patch
@@ -0,0 +1,26 @@
+https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457
+
+From 4ffcd59113fa26d7c2e9d5897b1eef919fd4b457 Mon Sep 17 00:00:00 2001
+From: Adam Hupp <adam@hupp.org>
+Date: Mon, 9 Jan 2023 12:55:15 -0800
+Subject: [PATCH] update test for upstream added gzip extensions
+
+--- a/test/python_magic_test.py
++++ b/test/python_magic_test.py
+@@ -134,7 +134,7 @@ def test_extension(self):
+             self.assert_values(m, {
+                 # some versions return '' for the extensions of a gz file,
+                 # including w/ the command line.  Who knows...
+-                'test.gz': ('gz/tgz/tpz/zabw/svgz', '', '???'),
++                'test.gz': ('gz/tgz/tpz/zabw/svgz/adz/kmy/xcfgz', 'gz/tgz/tpz/zabw/svgz', '', '???'),
+                 'name_use.jpg': 'jpeg/jpg/jpe/jfif',
+             })
+         except NotImplementedError:
+@@ -227,6 +227,5 @@ def test_pathlike(self):
+         m = magic.Magic(mime=True)
+         self.assertEqual('application/pdf', m.from_file(path))
+ 
+-
+ if __name__ == '__main__':
+     unittest.main()
+

diff --git a/dev-python/python-magic/python-magic-0.4.27.ebuild b/dev-python/python-magic/python-magic-0.4.27.ebuild
index 18f2483f5cce..18f913a8638a 100644
--- a/dev-python/python-magic/python-magic-0.4.27.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.27.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
@@ -31,6 +31,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-gzip-test.patch
+)
+
 distutils_enable_tests unittest
 
 python_test() {


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-06-24  6:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-24  6:43 [gentoo-commits] repo/gentoo:master commit in: dev-python/python-magic/, dev-python/python-magic/files/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox