Re: [PR PATCH] [Updated] python3-{mechanize,magic}

[ericonr <ericonr@users.noreply.github.com>]

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

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages python3stuff
https://github.com/void-linux/void-packages/pull/31033

python3-{mechanize,magic}
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31033.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3stuff-31033.patch --]
[-- Type: text/x-diff, Size: 4457 bytes --]

From fbb56379daa7933726657fed77bdaa1f0e39a4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 21 May 2021 02:13:23 -0300
Subject: [PATCH 1/2] python3-mechanize: update to 0.4.7.

---
 srcpkgs/python3-mechanize/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
index b23d78fd5bd1..5c9df2b45c96 100644
--- a/srcpkgs/python3-mechanize/template
+++ b/srcpkgs/python3-mechanize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mechanize'
 pkgname=python3-mechanize
-version=0.4.3
-revision=7
+version=0.4.7
+revision=1
 wrksrc="mechanize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,8 +11,9 @@ short_desc="Stateful programmatic web browsing (Python3)"
 maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/python-mechanize/mechanize"
+changelog="https://raw.githubusercontent.com/python-mechanize/mechanize/master/ChangeLog"
 distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+checksum=993da15561d335d9a6423d17c790e62dcfe92d7de620b3244fbd7a8efc422404
 
 post_install() {
 	vlicense LICENSE

From 7e4c7f6616a2e19509a633205803d48c927e9e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 21 May 2021 02:14:28 -0300
Subject: [PATCH 2/2] python3-magic: update to 0.4.24.

Add and fix tests with backported commit.
---
 ...e7ceac0e80e03adc75c858bb378c0427331a.patch | 24 +++++++++++++++++++
 srcpkgs/python3-magic/template                | 17 ++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch

diff --git a/srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch b/srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch
new file mode 100644
index 000000000000..ba4abc0796f7
--- /dev/null
+++ b/srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch
@@ -0,0 +1,24 @@
+From 0ae7e7ceac0e80e03adc75c858bb378c0427331a Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Fri, 22 Oct 2021 09:47:32 +0200
+Subject: [PATCH] Support file 5.41.
+
+In https://github.com/file/file/commit/7d9b0f0d853957ad88dae0f440fecd58d2740ca7,
+the MIME was changed for Python bytecode.
+---
+ test/test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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/srcpkgs/python3-magic/template b/srcpkgs/python3-magic/template
index 89ac640e7a4e..e47aea1a704d 100644
--- a/srcpkgs/python3-magic/template
+++ b/srcpkgs/python3-magic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-magic'
 pkgname=python3-magic
-version=0.4.18
-revision=5
+version=0.4.24
+revision=1
 wrksrc=python-magic-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,8 +10,19 @@ short_desc="File type identification using libmagic (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ahupp/python-magic"
+changelog="https://raw.githubusercontent.com/ahupp/python-magic/master/CHANGELOG"
 distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
-checksum=b787e8056c115f37e2af11e0b98dc67d5fc182ed5ed827a62f95e3a7f0ed4be4
+checksum=48b70b62caa8b911c8c79a1d06ab618037f00d09ac891b7490d0d890ff6e0632
+
+do_check() {
+	cd test/
+	# based on test/run.py but that requires python2 and other ugly things
+	(
+		export LC_ALL=en_US.UTF-8 PYTHONPATH=..
+		python3 test.py
+		python3 libmagic_test.py
+	)
+}
 
 post_install() {
 	vlicense LICENSE