On Sat, Feb 24, 2018 at 12:12:01AM +0500, Alexandr Shadchin wrote:
>
> On Fri, Jan 26, 2018 at 10:21:05PM +0100, Klemens Nanni wrote:
> > On Thu, Jan 25, 2018 at 11:18:38AM +0100, Remi Pointel wrote:
> > > this is the diff to update py-xdis to latest release.
> > >
> > > I enabled regress tests because it works fine with python3 FLAVOR.
> > On amd64 py3 tests run fine but py2 throw an error, see attached log.
> >
> > You're missing TEST_DEPENDS as well as py-click as RUN_DEPENDS, see
> > upstream's __pkginfo__.py.
> >
> > Updated diff below for the dependencies, haven't dealt with the test
> > error yet.
> >
>
> Sorry for delay. ok for me.
>
> Prepare update to 3.6.11
3.6.11 now with working tests for Python 2.7, python-tests was missing
as TDEP (thanks Stuart).
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-xdis/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 21 May 2017 17:54:10 -0000 1.11
+++ Makefile 23 Feb 2018 23:16:13 -0000
@@ -2,7 +2,7 @@
COMMENT = cross-version byte-code disassembler and marshal
routines
-MODPY_EGG_VERSION = 3.3.1
+MODPY_EGG_VERSION = 3.6.11
DISTNAME = xdis-${MODPY_EGG_VERSION}
PKGNAME = py-xdis-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -19,13 +19,18 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = devel/py-six${MODPY_FLAVOR}
+RUN_DEPENDS = devel/py-click${MODPY_FLAVOR} \
+ devel/py-six${MODPY_FLAVOR}
BUILD_DEPENDS = devel/py-test-runner${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-six${MODPY_FLAVOR} \
+ devel/py-test${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR ?=
-NO_TEST = Yes
+.if !${FLAVOR:Mpython3}
+TEST_DEPENDS += lang/python/${MODPY_VERSION},-tests
+.endif
post-install:
mv ${PREFIX}/bin/pydisasm{,${MODPY_BIN_SUFFIX}}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-xdis/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 21 May 2017 17:54:10 -0000 1.9
+++ distinfo 23 Feb 2018 23:16:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (xdis-3.3.1.tar.gz) = 1uVDkmmiq+H6caxMtnCsbfyeGKCeDErLL2RX8FQtU4M=
-SIZE (xdis-3.3.1.tar.gz) = 154152
+SHA256 (xdis-3.6.11.tar.gz) = FdrL7k6GuA5KuOFzSw81+zuITXpOGdtwoSnxe7jN3+I=
+SIZE (xdis-3.6.11.tar.gz) = 168216
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-xdis/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 26 Mar 2017 11:17:22 -0000 1.6
+++ pkg/PLIST 23 Feb 2018 23:16:13 -0000
@@ -16,6 +16,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}magics.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}marsh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}op_imports.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}std.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}unmarshal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
@@ -34,6 +35,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/xdis/magics.py
lib/python${MODPY_VERSION}/site-packages/xdis/main.py
lib/python${MODPY_VERSION}/site-packages/xdis/marsh.py
+lib/python${MODPY_VERSION}/site-packages/xdis/op_imports.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}/
@@ -47,19 +49,25 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_24.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_25.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_26.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_26pypy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_27.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_27pypy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_2x.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_30.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_31.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_32pypy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_33.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_34.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_35.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_35pypy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_36.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_37.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_3x.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_pypy26.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_pypy27.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_pypy32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_pypy35.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/base.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_15.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_20.py
@@ -69,19 +77,25 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_24.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_25.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_26.py
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_26pypy.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_27.py
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_27pypy.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_2x.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_30.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_31.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_32.py
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_32pypy.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_33.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_34.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_35.py
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_35pypy.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_36.py
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_37.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_3x.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_pypy26.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_pypy27.py
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_pypy32.py
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_pypy35.py
lib/python${MODPY_VERSION}/site-packages/xdis/std.py
lib/python${MODPY_VERSION}/site-packages/xdis/unmarshal.py
lib/python${MODPY_VERSION}/site-packages/xdis/util.py
