Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1711178101142780"
MIME-Version: 1.0
Date: Sat, 23 Mar 2024 07:15:01 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/lang/py-uncompyle6
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20240323071501.6A485FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1711178101142780
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Sat Mar 23 07:15:01 UTC 2024

Modified Files:
	pkgsrc/lang/py-uncompyle6: Makefile PLIST distinfo

Log Message:
py-uncompyle6: updated to 3.9.1

3.9.1

Lots of changes major changes. track xdis API has changes.

Separate Phases more clearly:

disassembly
tokenization
parsing
abstracting to AST (more is done in newer projects)
printing
Although we do not decompile bytecode greater than 3.8, code supports running from up to 3.12.

Many bugs fixed.

A lot of Linting and coding style modernization.

Work done in preparation for Blackhat Asia 2024


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/py-uncompyle6/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/py-uncompyle6/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/py-uncompyle6/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1711178101142780
Content-Disposition: inline
Content-Length: 6310
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/py-uncompyle6/Makefile
diff -u pkgsrc/lang/py-uncompyle6/Makefile:1.33 pkgsrc/lang/py-uncompyle6/Makefile:1.34
--- pkgsrc/lang/py-uncompyle6/Makefile:1.33	Sun Nov  5 11:49:51 2023
+++ pkgsrc/lang/py-uncompyle6/Makefile	Sat Mar 23 07:15:01 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2023/11/05 11:49:51 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2024/03/23 07:15:01 adam Exp $
 
-DISTNAME=	uncompyle6-3.9.0
+DISTNAME=	uncompyle6-3.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	lang python
 MASTER_SITES=	${MASTER_SITE_PYPI:=u/uncompyle6/}
@@ -10,26 +10,24 @@ HOMEPAGE=	https://github.com/rocky/pytho
 COMMENT=	Python cross-version byte-code decompiler
 LICENSE=	gnu-gpl-v3
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools>=61:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=	${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-spark-parser>=1.8.9:../../lang/py-spark-parser
-DEPENDS+=	${PYPKGPREFIX}-xdis>=6.0.2:../../devel/py-xdis
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+DEPENDS+=	${PYPKGPREFIX}-xdis>=6.0.8:../../devel/py-xdis
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-xdis
-# no support for python 3.11 or 3.12 yet
-# https://github.com/rocky/python-uncompyle6/issues/423
-PYTHON_VERSIONS_INCOMPATIBLE+=	311 312
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-USE_PKG_RESOURCES=	yes
+# ModuleNotFoundError: No module named '__pkginfo__'
+pre-configure:
+	${RM} ${WRKSRC}/pyproject.toml
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} pydisassemble pydisassemble-${PYVERSSUFFIX} && \
 	${MV} uncompyle6 uncompyle6-${PYVERSSUFFIX} || ${TRUE}
 
-do-test:
-	cd ${WRKSRC}/pytest && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
-
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/py-uncompyle6/PLIST
diff -u pkgsrc/lang/py-uncompyle6/PLIST:1.15 pkgsrc/lang/py-uncompyle6/PLIST:1.16
--- pkgsrc/lang/py-uncompyle6/PLIST:1.15	Mon Jan 16 09:27:16 2023
+++ pkgsrc/lang/py-uncompyle6/PLIST	Sat Mar 23 07:15:01 2024
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.15 2023/01/16 09:27:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2024/03/23 07:15:01 adam Exp $
 bin/pydisassemble-${PYVERSSUFFIX}
 bin/uncompyle6-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_INFODIR}/zip-safe
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/zip-safe
 ${PYSITELIB}/uncompyle6/__init__.py
 ${PYSITELIB}/uncompyle6/__init__.pyc
 ${PYSITELIB}/uncompyle6/__init__.pyo
@@ -134,9 +134,6 @@ ${PYSITELIB}/uncompyle6/parsers/reducech
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/for_block_check.py
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/for_block_check.pyc
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/for_block_check.pyo
-${PYSITELIB}/uncompyle6/parsers/reducecheck/ifelsestmt-save.py
-${PYSITELIB}/uncompyle6/parsers/reducecheck/ifelsestmt-save.pyc
-${PYSITELIB}/uncompyle6/parsers/reducecheck/ifelsestmt-save.pyo
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/ifelsestmt.py
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/ifelsestmt.pyc
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/ifelsestmt.pyo
@@ -161,6 +158,9 @@ ${PYSITELIB}/uncompyle6/parsers/reducech
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/or_check.py
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/or_check.pyc
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/or_check.pyo
+${PYSITELIB}/uncompyle6/parsers/reducecheck/pop_return.py
+${PYSITELIB}/uncompyle6/parsers/reducecheck/pop_return.pyc
+${PYSITELIB}/uncompyle6/parsers/reducecheck/pop_return.pyo
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/testtrue.py
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/testtrue.pyc
 ${PYSITELIB}/uncompyle6/parsers/reducecheck/testtrue.pyo
@@ -341,9 +341,6 @@ ${PYSITELIB}/uncompyle6/semantics/custom
 ${PYSITELIB}/uncompyle6/semantics/fragments.py
 ${PYSITELIB}/uncompyle6/semantics/fragments.pyc
 ${PYSITELIB}/uncompyle6/semantics/fragments.pyo
-${PYSITELIB}/uncompyle6/semantics/gencomp-try.py
-${PYSITELIB}/uncompyle6/semantics/gencomp-try.pyc
-${PYSITELIB}/uncompyle6/semantics/gencomp-try.pyo
 ${PYSITELIB}/uncompyle6/semantics/gencomp.py
 ${PYSITELIB}/uncompyle6/semantics/gencomp.pyc
 ${PYSITELIB}/uncompyle6/semantics/gencomp.pyo
@@ -371,9 +368,6 @@ ${PYSITELIB}/uncompyle6/semantics/n_acti
 ${PYSITELIB}/uncompyle6/semantics/parser_error.py
 ${PYSITELIB}/uncompyle6/semantics/parser_error.pyc
 ${PYSITELIB}/uncompyle6/semantics/parser_error.pyo
-${PYSITELIB}/uncompyle6/semantics/pysource-bad.py
-${PYSITELIB}/uncompyle6/semantics/pysource-bad.pyc
-${PYSITELIB}/uncompyle6/semantics/pysource-bad.pyo
 ${PYSITELIB}/uncompyle6/semantics/pysource.py
 ${PYSITELIB}/uncompyle6/semantics/pysource.pyc
 ${PYSITELIB}/uncompyle6/semantics/pysource.pyo

Index: pkgsrc/lang/py-uncompyle6/distinfo
diff -u pkgsrc/lang/py-uncompyle6/distinfo:1.28 pkgsrc/lang/py-uncompyle6/distinfo:1.29
--- pkgsrc/lang/py-uncompyle6/distinfo:1.28	Mon Jan 16 09:27:16 2023
+++ pkgsrc/lang/py-uncompyle6/distinfo	Sat Mar 23 07:15:01 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2023/01/16 09:27:16 adam Exp $
+$NetBSD: distinfo,v 1.29 2024/03/23 07:15:01 adam Exp $
 
-BLAKE2s (uncompyle6-3.9.0.tar.gz) = e150cec1bea7fcc1ba9cf751f46cba0d3a3052f799980daac2e59c89983b2fe8
-SHA512 (uncompyle6-3.9.0.tar.gz) = ff1efcb14a859e343d7633c3f3de92535c8dce30395eaa11a9e0c433aebef90a13cb052088e5cc1ce42e0b789d54a84e2a13f2804ee5f7038aef72d23cd9e270
-Size (uncompyle6-3.9.0.tar.gz) = 2569924 bytes
+BLAKE2s (uncompyle6-3.9.1.tar.gz) = 36f0e174b2d6d27b599103e2bc802d6140696095a11c4727fa958c3f1dadb380
+SHA512 (uncompyle6-3.9.1.tar.gz) = 13528c12e65c2daa584d727ed966993c5cb11d2aeff29e5d497195111b40ab2f1cccb0ff3ad28116b57e1b01bdaa36147de5afb7a484c717a1f5189cabf9e3e8
+Size (uncompyle6-3.9.1.tar.gz) = 2495775 bytes


--_----------=_1711178101142780--