Hi Kurt,

> I noticed the deletion of the homepage. There *is* a homepage on
> Github. It's linked from the pypi page.
> 
> Here's a version that does away with all the weird do-test manipulations
> also and just uses MODPY_PYTEST. I added a patch to disable a few tests
> as they would just hang.

The updated patch works fine here as well on amd64, thanks!

Daniel

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-serial/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  28 Apr 2019 20:51:36 -0000      1.10
> +++ Makefile  4 May 2019 17:20:14 -0000
> @@ -2,14 +2,13 @@
> 
> COMMENT =             serial interface class for Python
> 
> -MODPY_EGG_VERSION =  2.7
> +MODPY_EGG_VERSION =  3.4
> DISTNAME =            pyserial-${MODPY_EGG_VERSION}
> PKGNAME =             ${DISTNAME:S/py/py-/}
> -REVISION =           1
> 
> CATEGORIES =          devel
> 
> -HOMEPAGE =           http://pyserial.sourceforge.net/
> +HOMEPAGE =           https://github.com/pyserial/pyserial
> 
> MAINTAINER =          Daniel Winters <[email protected]>
> 
> @@ -18,6 +17,8 @@ PERMIT_PACKAGE_CDROM =      Yes
> 
> MODULES =             lang/python
> MODPY_PI =            Yes
> +MODPY_SETUPTOOLS =   Yes
> +MODPY_PYTEST =               Yes
> 
> FLAVORS =             python3
> FLAVOR ?=
> @@ -28,20 +29,9 @@ EXAMPLESDIR =              ${PREFIX}/share/examples/
> post-install:
>       cd ${PREFIX}/bin/ && mv miniterm.py miniterm-${MODPY_VERSION}.py
>       ${INSTALL_DATA_DIR} ${DOCSDIR}
> -     ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/LICENSE.txt ${DOCSDIR}
> +     ${INSTALL_DATA} ${WRKSRC}/README.rst ${WRKSRC}/LICENSE.txt ${DOCSDIR}
>       ${INSTALL_DATA} ${WRKSRC}/documentation/*.rst ${DOCSDIR}
>       ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
>       ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
> -
> -# NOTE: tests require a serial setup; see ${WRKSRC}/examples/test.py
> -# for more information
> -do-test:
> -     cd ${WRKSRC} && \
> -     for _test in ${WRKSRC}/examples/test*; do \
> -             PYTHONPATH=. ${MODPY_BIN} $${_test}; \
> -     done
> -.for _test in ${WRKSRC}/examples/test*
> -     cd ${WRKSRC} && ${MODPY_BIN} ${_test}
> -.endfor
> 
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-serial/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  20 Jul 2015 00:33:13 -0000      1.3
> +++ distinfo  4 May 2019 17:20:14 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pyserial-2.7.tar.gz) = NULsCDh5PmHWIk4n/wXozkulpcXMTsXGo+jUkkeYVHc=
> -SIZE (pyserial-2.7.tar.gz) = 122081
> +SHA256 (pyserial-3.4.tar.gz) = bi1AH97g6rmWz3NOZ3c6AUO5MncsqLQkUUQM/tlCxic=
> +SIZE (pyserial-3.4.tar.gz) = 151657
> Index: patches/patch-test_test_pty_py
> ===================================================================
> RCS file: patches/patch-test_test_pty_py
> diff -N patches/patch-test_test_pty_py
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-test_test_pty_py    4 May 2019 17:20:14 -0000
> @@ -0,0 +1,43 @@
> +$OpenBSD$
> +
> +Some pty tests hang
> +
> +Index: test/test_pty.py
> +--- test/test_pty.py.orig
> ++++ test/test_pty.py
> +@@ -32,21 +32,21 @@ class Test_Pty_Serial_Open(unittest.TestCase):
> +         with serial.Serial(os.ttyname(self.slave), timeout=1) as slave:
> +             pass  # OK
> + 
> +-    def test_pty_serial_write(self):
> +-        with serial.Serial(os.ttyname(self.slave), timeout=1) as slave:
> +-            with os.fdopen(self.master, "wb") as fd:
> +-                fd.write(DATA)
> +-                fd.flush()
> +-                out = slave.read(len(DATA))
> +-                self.assertEqual(DATA, out)
> ++    # ~def test_pty_serial_write(self):
> ++        # ~with serial.Serial(os.ttyname(self.slave), timeout=1) as slave:
> ++            # ~with os.fdopen(self.master, "wb") as fd:
> ++                # ~fd.write(DATA)
> ++                # ~fd.flush()
> ++                # ~out = slave.read(len(DATA))
> ++                # ~self.assertEqual(DATA, out)
> + 
> +-    def test_pty_serial_read(self):
> +-        with serial.Serial(os.ttyname(self.slave), timeout=1) as slave:
> +-            with os.fdopen(self.master, "rb") as fd:
> +-                slave.write(DATA)
> +-                slave.flush()
> +-                out = fd.read(len(DATA))
> +-                self.assertEqual(DATA, out)
> ++    # ~def test_pty_serial_read(self):
> ++        # ~with serial.Serial(os.ttyname(self.slave), timeout=1) as slave:
> ++            # ~with os.fdopen(self.master, "rb") as fd:
> ++                # ~slave.write(DATA)
> ++                # ~slave.flush()
> ++                # ~out = fd.read(len(DATA))
> ++                # ~self.assertEqual(DATA, out)
> + 
> +     #~ def test_pty_serial_master_read(self):
> +         #~ with serial.Serial(os.ttyname(self.master), timeout=1) as master:
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-serial/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 20 Jul 2015 00:33:13 -0000      1.2
> +++ pkg/PLIST 4 May 2019 17:20:14 -0000
> @@ -1,36 +1,48 @@
> @comment $OpenBSD: PLIST,v 1.2 2015/07/20 00:33:13 jca Exp $
> bin/miniterm-${MODPY_VERSION}.py
> -lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
> +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/serial/
> lib/python${MODPY_VERSION}/site-packages/serial/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}rfc2217.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}rs485.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialcli.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialjava.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialposix.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialutil.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialwin32.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}sermsdos.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/rfc2217.py
> +lib/python${MODPY_VERSION}/site-packages/serial/rs485.py
> lib/python${MODPY_VERSION}/site-packages/serial/serialcli.py
> lib/python${MODPY_VERSION}/site-packages/serial/serialjava.py
> lib/python${MODPY_VERSION}/site-packages/serial/serialposix.py
> lib/python${MODPY_VERSION}/site-packages/serial/serialutil.py
> lib/python${MODPY_VERSION}/site-packages/serial/serialwin32.py
> -lib/python${MODPY_VERSION}/site-packages/serial/sermsdos.py
> +lib/python${MODPY_VERSION}/site-packages/serial/threaded/
> +lib/python${MODPY_VERSION}/site-packages/serial/threaded/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/serial/threaded/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/serial/threaded/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/tools/
> lib/python${MODPY_VERSION}/site-packages/serial/tools/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}hexlify_codec.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_common.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_linux.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_osx.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_posix.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_windows.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}miniterm.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/tools/hexlify_codec.py
> lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports.py
> +lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_common.py
> lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_linux.py
> lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_osx.py
> lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_posix.py
> @@ -40,32 +52,36 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_alt.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_hwgrep.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_loop.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_rfc2217.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_serve-rfc2217.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_socket.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_spy.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_alt.py
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_hwgrep.py
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_loop.py
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_rfc2217.py
> +lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_serve-rfc2217.py
> lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_socket.py
> +lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_spy.py
> lib/python${MODPY_VERSION}/site-packages/serial/win32.py
> share/doc/${MODPY_PY_PREFIX}serial/
> share/doc/${MODPY_PY_PREFIX}serial/LICENSE.txt
> -share/doc/${MODPY_PY_PREFIX}serial/README.txt
> +share/doc/${MODPY_PY_PREFIX}serial/README.rst
> share/doc/${MODPY_PY_PREFIX}serial/appendix.rst
> share/doc/${MODPY_PY_PREFIX}serial/examples.rst
> share/doc/${MODPY_PY_PREFIX}serial/index.rst
> -share/doc/${MODPY_PY_PREFIX}serial/pyparallel.rst
> share/doc/${MODPY_PY_PREFIX}serial/pyserial.rst
> share/doc/${MODPY_PY_PREFIX}serial/pyserial_api.rst
> share/doc/${MODPY_PY_PREFIX}serial/shortintro.rst
> +share/doc/${MODPY_PY_PREFIX}serial/tools.rst
> +share/doc/${MODPY_PY_PREFIX}serial/url_handlers.rst
> share/examples/${MODPY_PY_PREFIX}serial/
> -share/examples/${MODPY_PY_PREFIX}serial/enhancedserial.py
> +share/examples/${MODPY_PY_PREFIX}serial/at_protocol.py
> share/examples/${MODPY_PY_PREFIX}serial/port_publisher.py
> share/examples/${MODPY_PY_PREFIX}serial/rfc2217_server.py
> -share/examples/${MODPY_PY_PREFIX}serial/scan.py
> -share/examples/${MODPY_PY_PREFIX}serial/scanlinux.py
> -share/examples/${MODPY_PY_PREFIX}serial/scanwin32.py
> share/examples/${MODPY_PY_PREFIX}serial/setup-miniterm-py2exe.py
> share/examples/${MODPY_PY_PREFIX}serial/setup-rfc2217_server-py2exe.py
> share/examples/${MODPY_PY_PREFIX}serial/setup-wxTerminal-py2exe.py

—

Daniel Winters
[email protected]
‭+43 660 7497416

Signal: +1 626 485 1060
Skype: danielwinters42
Zoom: 803-404-1792



Reply via email to