From 78bc5d82ef701b100c0e60455459f52901bfd66f Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Wed, 15 Dec 2021 09:34:12 +0000
Subject: [PATCH] Update to 3.3.0. From the changelog:

- Breaking change: PythonNativeReporter removed extra blank lines in
  output
- New reporter: ReportOnCyberDojo creates FileName.testname.diff
- New feature: verify_binary (closes #67)

pkgsrc changes:

- Replace "version" with "version_number" to fix module loading. Issue
  reported upstream.
---
 devel/py-approvaltests/Makefile                       |  8 ++++++--
 devel/py-approvaltests/PLIST                          | 11 ++++++++++-
 devel/py-approvaltests/distinfo                       |  9 +++++----
 .../patches/patch-approvaltests_version.py            | 10 ++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 devel/py-approvaltests/patches/patch-approvaltests_version.py

diff --git a/devel/py-approvaltests/Makefile b/devel/py-approvaltests/Makefile
index a46da6a236eb..5df277f261a1 100644
--- a/devel/py-approvaltests/Makefile
+++ b/devel/py-approvaltests/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2021/12/15 09:08:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2021/12/15 09:34:12 schmonz Exp $
 
-DISTNAME=	approvaltests-3.1.1
+DISTNAME=	approvaltests-3.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/approvaltests/}
@@ -15,6 +15,10 @@ DEPENDS+=	${PYPKGPREFIX}-empty-files-[0-9]*:../../devel/py-empty-files
 DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.5.27:../../x11/py-pyperclip
 
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+#TEST_DEPENDS+=	${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
+
+#do-test:
+#	(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} -m tox)
 
 USE_LANGUAGES=	# none
 
diff --git a/devel/py-approvaltests/PLIST b/devel/py-approvaltests/PLIST
index fc86e2a3c1ea..c01b4f94dedd 100644
--- a/devel/py-approvaltests/PLIST
+++ b/devel/py-approvaltests/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2021/09/29 10:09:04 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/12/15 09:34:12 schmonz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -16,6 +16,9 @@ ${PYSITELIB}/approvaltests/approvals.pyo
 ${PYSITELIB}/approvaltests/asserts.py
 ${PYSITELIB}/approvaltests/asserts.pyc
 ${PYSITELIB}/approvaltests/asserts.pyo
+${PYSITELIB}/approvaltests/binary_writer.py
+${PYSITELIB}/approvaltests/binary_writer.pyc
+${PYSITELIB}/approvaltests/binary_writer.pyo
 ${PYSITELIB}/approvaltests/combination_approvals.py
 ${PYSITELIB}/approvaltests/combination_approvals.pyc
 ${PYSITELIB}/approvaltests/combination_approvals.pyo
@@ -88,6 +91,12 @@ ${PYSITELIB}/approvaltests/reporters/received_file_launcher_reporter.pyo
 ${PYSITELIB}/approvaltests/reporters/report_all_to_clipboard.py
 ${PYSITELIB}/approvaltests/reporters/report_all_to_clipboard.pyc
 ${PYSITELIB}/approvaltests/reporters/report_all_to_clipboard.pyo
+${PYSITELIB}/approvaltests/reporters/report_by_creating_diff_file.py
+${PYSITELIB}/approvaltests/reporters/report_by_creating_diff_file.pyc
+${PYSITELIB}/approvaltests/reporters/report_by_creating_diff_file.pyo
+${PYSITELIB}/approvaltests/reporters/report_on_cyber_dojo.py
+${PYSITELIB}/approvaltests/reporters/report_on_cyber_dojo.pyc
+${PYSITELIB}/approvaltests/reporters/report_on_cyber_dojo.pyo
 ${PYSITELIB}/approvaltests/reporters/report_to_diff_engine.py
 ${PYSITELIB}/approvaltests/reporters/report_to_diff_engine.pyc
 ${PYSITELIB}/approvaltests/reporters/report_to_diff_engine.pyo
diff --git a/devel/py-approvaltests/distinfo b/devel/py-approvaltests/distinfo
index 3577482b3d4a..5170f389800e 100644
--- a/devel/py-approvaltests/distinfo
+++ b/devel/py-approvaltests/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.27 2021/12/15 09:08:40 schmonz Exp $
+$NetBSD: distinfo,v 1.28 2021/12/15 09:34:12 schmonz Exp $
 
-BLAKE2s (approvaltests-3.1.1.tar.gz) = f9780f8d4089b71a06e05255d82e90660b9e135222f5073012c8fe8091743137
-SHA512 (approvaltests-3.1.1.tar.gz) = acca27d2c175eca5a3a6af65ee3cbcf9f9cb5718a0a54714dbdffb89dc6fe268f6d26faf1c6ff28ebf2efca3dc39665f0f633a00a3fd281817fe9e05969ac854
-Size (approvaltests-3.1.1.tar.gz) = 25971 bytes
+BLAKE2s (approvaltests-3.3.0.tar.gz) = ccb691f7ab01cae0641f5cf931bd106da4fbe6ddd187495f1e4f9705c26a7dc1
+SHA512 (approvaltests-3.3.0.tar.gz) = aa8be46192f8c1acfb6aad2532ff9bd84dbc1995ca2de565c5a32aa72a58952df81c855c5d2079589d2386c46ee7a817792f1a8149f47f724c0256b06b134037
+Size (approvaltests-3.3.0.tar.gz) = 26591 bytes
+SHA1 (patch-approvaltests_version.py) = 985308ca98d289a05f1738bfb93455928242c1c4
diff --git a/devel/py-approvaltests/patches/patch-approvaltests_version.py b/devel/py-approvaltests/patches/patch-approvaltests_version.py
new file mode 100644
index 000000000000..c24ec7d44add
--- /dev/null
+++ b/devel/py-approvaltests/patches/patch-approvaltests_version.py
@@ -0,0 +1,10 @@
+$NetBSD: patch-approvaltests_version.py,v 1.1 2021/12/15 09:34:12 schmonz Exp $
+
+Fix "NameError: name 'version_number' is not defined" to allow
+module to load.
+
+--- approvaltests/version.py.orig	2021-12-05 18:45:00.000000000 +0000
++++ approvaltests/version.py
+@@ -1 +1 @@
+-version="v3.3.0"
++version_number="v3.3.0"