Attachment #218825 for bug #250379

View | Details | Raw Unified | Return to bug 250379 | Differences between
Collapse All | Expand All





PORTNAME=	cherrypy
PORTVERSION=	17.4.2
PORTREVISION=	1
CATEGORIES=	www python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}

EXAMPLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR}
EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}cheroot>=6.2.4:www/py-cheroot@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}portend>=2.1.1:net/py-portend@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR}

USES=		python

EXAMPLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR}
EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}

OPTIONS_DEFINE=	EXAMPLES

PORTEXAMPLES=	*

USES=		python
USE_PYTHON=	distutils autoplist concurrent

.include <bsd.port.options.mk>


.include <bsd.port.pre.mk>

.if ${PYTHON_REL} >= 3000
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-contextlib
.endif

.if ${PYTHON_REL} < 3000
RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}more-itertools5>0:devel/py-more-itertools5@${PY_FLAVOR}
EXAMPLES_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR}
.else
RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
EXAMPLES_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR}
.endif





Patches to remove contextlib2 and use contextlib from the standard library.
Contextlib has been in the Python standard library since Python 3.2
Contextlib2 is a backport to Python 2 (and is supported through Python 3.7).

Patch based on upstream commit:
https://github.com/cherrypy/cherrypy/commit/2fc78dc9af3e

--- setup.py.orig	2020-10-16 01:28:48 UTC
+++ setup.py
@@ -66,7 +66,6 @@ params = dict(
         'portend>=2.1.1',
         'more_itertools',
         'zc.lockfile',
-        'contextlib2',
     ],
     extras_require={
         'docs': [

--- cherrypy/lib/sessions.py.orig	2020-10-16 01:25:39 UTC
+++ cherrypy/lib/sessions.py
@@ -109,7 +109,7 @@ import binascii
 
 import six
 from six.moves import cPickle as pickle
-import contextlib2
+import contextlib
 
 import zc.lockfile
 
@@ -572,7 +572,7 @@ class FileSession(Session):
     def release_lock(self, path=None):
         """Release the lock on the currently-loaded session data."""
         self.lock.close()
-        with contextlib2.suppress(FileNotFoundError):
+        with contextlib.suppress(FileNotFoundError):
             os.remove(self.lock._path)
         self.locked = False
 

Return to bug 250379

Lines 3-8 Link Here

(-)www/py-cherrypy/Makefile (-7 / +10 lines)
3		3
4	PORTNAME= cherrypy	4	PORTNAME= cherrypy
5	PORTVERSION= 17.4.2	5	PORTVERSION= 17.4.2
		6	PORTREVISION= 1
6	CATEGORIES= www python	7	CATEGORIES= www python
7	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 16-34 Link Here
16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \	17	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}	18	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
18		19
19	EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR}
20	EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
21
22	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \	20	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}cheroot>=6.2.4:www/py-cheroot@${PY_FLAVOR} \	21	${PYTHON_PKGNAMEPREFIX}cheroot>=6.2.4:www/py-cheroot@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}portend>=2.1.1:net/py-portend@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}portend>=2.1.1:net/py-portend@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR}	23	${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR}
26		24
		25	USES= python
		26
		27	EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR}
		28	EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
		29
27	OPTIONS_DEFINE= EXAMPLES	30	OPTIONS_DEFINE= EXAMPLES
28		31
29	PORTEXAMPLES= *	32	PORTEXAMPLES= *
30		33
31	USES= python
32	USE_PYTHON= distutils autoplist concurrent	34	USE_PYTHON= distutils autoplist concurrent
33		35
34	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
Lines 45-59 Link Here
45		47
46	.include <bsd.port.pre.mk>	48	.include <bsd.port.pre.mk>
47		49
48	.if ${PYTHON_REL} < 3800	50	.if ${PYTHON_REL} >= 3000
49	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}	51	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-contextlib
50	.endif	52	.endif
51		53
52	.if ${PYTHON_REL} < 3000	54	.if ${PYTHON_REL} < 3000
53	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools5>0:devel/py-more-itertools5@${PY_FLAVOR}	55	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools5>0:devel/py-more-itertools5@${PY_FLAVOR}
54	EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR}	56	EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR}
55	.else	57	.else
56	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR}	58	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
		59	${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
57	EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR}	60	EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR}
58	.endif	61	.endif
59		62

Line 0 Link Here

(-)www/py-cherrypy/files/extra-patch-contextlib (+38 lines)
	1	Patches to remove contextlib2 and use contextlib from the standard library.
	2	Contextlib has been in the Python standard library since Python 3.2
	3	Contextlib2 is a backport to Python 2 (and is supported through Python 3.7).
	4
	5	Patch based on upstream commit:
	6	https://github.com/cherrypy/cherrypy/commit/2fc78dc9af3e
	7
	8	--- setup.py.orig 2020-10-16 01:28:48 UTC
	9	+++ setup.py
	10	@@ -66,7 +66,6 @@ params = dict(
	11	'portend>=2.1.1',
	12	'more_itertools',
	13	'zc.lockfile',
	14	- 'contextlib2',
	15	],
	16	extras_require={
	17	'docs': [
	18
	19	--- cherrypy/lib/sessions.py.orig 2020-10-16 01:25:39 UTC
	20	+++ cherrypy/lib/sessions.py
	21	@@ -109,7 +109,7 @@ import binascii
	22
	23	import six
	24	from six.moves import cPickle as pickle
	25	-import contextlib2
	26	+import contextlib
	27
	28	import zc.lockfile
	29
	30	@@ -572,7 +572,7 @@ class FileSession(Session):
	31	def release_lock(self, path=None):
	32	"""Release the lock on the currently-loaded session data."""
	33	self.lock.close()
	34	- with contextlib2.suppress(FileNotFoundError):
	35	+ with contextlib.suppress(FileNotFoundError):
	36	os.remove(self.lock._path)
	37	self.locked = False
	38