Index: ./devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1944
diff -u -p -r1.1944 Makefile
--- ./devel/Makefile 4 Mar 2020 06:37:36 -0000 1.1944
+++ ./devel/Makefile 7 Mar 2020 19:56:55 -0000
@@ -1747,7 +1747,6 @@
SUBDIR += py-wrapt
SUBDIR += py-wrapt,python3
SUBDIR += py-wsgiutils
- SUBDIR += py-wurlitzer
SUBDIR += py-wurlitzer,python3
SUBDIR += py-xdg
SUBDIR += py-xdg,python3
Index: ./devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.893
diff -u -p -r1.893 Quirks.pm
--- ./devel/quirks/files/Quirks.pm 7 Mar 2020 06:50:42 -0000 1.893
+++ ./devel/quirks/files/Quirks.pm 7 Mar 2020 19:57:04 -0000
@@ -382,6 +382,7 @@ my $stem_extensions = {
'spyder' => 'spyder3',
'py-qtconsole' => 'py3-qtconsole',
'py-sympy' => 'py3-sympy',
+ 'py-wurlitzer' => 'py3-wurlitzer',
};
my $obsolete_reason = {
Index: ./devel/py-wurlitzer/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-wurlitzer/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- ./devel/py-wurlitzer/Makefile 12 Jul 2019 20:45:56 -0000 1.6
+++ ./devel/py-wurlitzer/Makefile 7 Mar 2020 19:57:12 -0000
@@ -2,15 +2,16 @@
COMMENT = capture c-level output in context managers
-MODPY_EGG_VERSION = 1.0.2
+MODPY_EGG_VERSION = 2.0.0
DISTNAME = wurlitzer-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
HOMEPAGE = https://github.com/minrk/wurlitzer
+MAINTAINER = Elias M. Mariani <marianielias@gmail.com>
+
# MIT
PERMIT_PACKAGE = Yes
@@ -21,10 +22,10 @@ MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = test.py
-TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
-
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
+
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
pre-configure:
cd ${WRKDIR}; ${CC} ${CFLAGS} ${FILESDIR}/getsize.c -o getsize; \
Index: ./devel/py-wurlitzer/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-wurlitzer/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- ./devel/py-wurlitzer/distinfo 14 Feb 2019 22:34:18 -0000 1.1.1.1
+++ ./devel/py-wurlitzer/distinfo 7 Mar 2020 19:57:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (wurlitzer-1.0.2.tar.gz) = I+ha8IULmK3Xe+8KHrR7JDuqspFgEx00kjTJ38nlet0=
-SIZE (wurlitzer-1.0.2.tar.gz) = 7245
+SHA256 (wurlitzer-2.0.0.tar.gz) = hqUQwNNPzJeGrRqfVXrJgPMO8vghp1wuQzMxHg/ZzXY=
+SIZE (wurlitzer-2.0.0.tar.gz) = 10203
Index: ./devel/py-wurlitzer/patches/patch-setup_py
===================================================================
RCS file: ./devel/py-wurlitzer/patches/patch-setup_py
diff -N ./devel/py-wurlitzer/patches/patch-setup_py
--- ./devel/py-wurlitzer/patches/patch-setup_py 14 Feb 2019 22:34:18 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2019/02/14 22:34:18 mariani Exp $
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
- import sys
-
--from distutils.core import setup
-+from setuptools import setup
-
- long_description = """
- Context managers for capturing C-level output::
Index: ./devel/py-wurlitzer/patches/patch-wurlitzer_py
===================================================================
RCS file: /cvs/ports/devel/py-wurlitzer/patches/patch-wurlitzer_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-wurlitzer_py
--- ./devel/py-wurlitzer/patches/patch-wurlitzer_py 14 Feb 2019 22:34:18 -0000 1.1.1.1
+++ ./devel/py-wurlitzer/patches/patch-wurlitzer_py 7 Mar 2020 19:57:12 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-wurlitzer_py,v 1.1.1.1 2
Index: wurlitzer.py
--- wurlitzer.py.orig
+++ wurlitzer.py
-@@ -32,13 +32,20 @@ import warnings
+@@ -39,13 +39,20 @@ import warnings
libc = ctypes.CDLL(None)
Index: ./devel/py-wurlitzer/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-wurlitzer/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- ./devel/py-wurlitzer/pkg/PLIST 14 Feb 2019 22:34:18 -0000 1.1.1.1
+++ ./devel/py-wurlitzer/pkg/PLIST 7 Mar 2020 19:57:12 -0000
@@ -1,8 +1,11 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/02/14 22:34:18 mariani Exp $
+@conflict py-wurlitzer-*
+@pkgpath net/py-wurlitzer
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}wurlitzer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/wurlitzer-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/wurlitzer-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/wurlitzer-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/wurlitzer-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/wurlitzer-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/wurlitzer-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/wurlitzer.py
Ups...
Given that py-spyder-kernels no longer exists:
Moving py-wurlitzer to -> py3-wurlitzer
- Removed unnecessary patch for setup.py
- Unhooked devel/py-wurlitzer from devel/Makefile
- Added 'py-wurlitzer' => 'py3-wurlitzer' in quirks (reversion change pending)
- FLAVOR ?= to FLAVOR = python3 in Makefile
- Added in PLIST:
@conflict py-wurlitzer-*
@pkgpath net/py-wurlitzer
Update tested OK:
pkg_add -u py3-wurlitzer
py3-wurlitzer-1.0.2p1->2.0.0: ok
Tested with spyder3 (unique consumer), no problems found.
Looking for OKs.
Sorry for the previous mail.
Cheers.
On Sat, Mar 7, 2020 at 2:34 PM Elias M. Mariani <marianielias@gmail.com> wrote:
>
> Changelog:
> https://github.com/minrk/wurlitzer/blob/2.0.0/CHANGELOG.md
>
> Nothing of impact.
> We only have it on the tree as a dendency of
> devel/spyder/py-spyder-kernels,python3
>
> Regression tests passing.
>
> Added myself as a maintainer (again).
>
> Comments ? OK ?
> I'm the original submitter of this port, but It has been a year since
> I sent something to the ports tree, so, feedback is most welcome. :)
>
> Cheers.
> Elias.
No comments:
Post a Comment