update to py3-CherryPy-18.4.0, getting rid of bogus contextlib2 rdep
(it's only for backports to py2, but the in-tree version had a dep in setup.py) not the newest, but saves going through the process to get a new port imported needed by newer versions (jaraco.collections)
This commit is contained in:
sthen
parent
23cec41291
commit
365bee18a5
@ -1,14 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.31 2021/11/02 00:02:52 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.32 2022/02/25 12:15:41 sthen Exp $
|
||||
|
||||
COMMENT= pythonic, object-oriented web development framework
|
||||
|
||||
MODPY_EGG_VERSION= 17.4.2
|
||||
MODPY_EGG_VERSION= 18.4.0
|
||||
DISTNAME= CherryPy-${MODPY_EGG_VERSION}
|
||||
PKGNAME= py-${DISTNAME}
|
||||
CATEGORIES= www
|
||||
REVISION= 4
|
||||
|
||||
HOMEPAGE= https://www.cherrypy.org/
|
||||
HOMEPAGE= https://cherrypy.dev/
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE= Yes
|
||||
@ -22,12 +21,10 @@ MODPY_SETUPTOOLS= Yes
|
||||
MODPY_PYTEST_ARGS= cherrypy/ --ignore cherrypy/test/test_wsgi_unix_socket.py
|
||||
|
||||
BUILD_DEPENDS= devel/py-setuptools_scm${MODPY_FLAVOR}
|
||||
RUN_DEPENDS= devel/py-contextlib2${MODPY_FLAVOR} \
|
||||
devel/py-more-itertools${MODPY_FLAVOR} \
|
||||
devel/py-six${MODPY_FLAVOR}>=1.11.0 \
|
||||
RUN_DEPENDS= devel/py-more-itertools${MODPY_FLAVOR} \
|
||||
devel/py-zc-lockfile${MODPY_FLAVOR} \
|
||||
net/py-portend${MODPY_FLAVOR}>=2.1.1 \
|
||||
www/py-cheroot${MODPY_FLAVOR}>=6.2.4
|
||||
www/py-cheroot${MODPY_FLAVOR}>=8.2.1
|
||||
TEST_DEPENDS= devel/py-path.py${MODPY_FLAVOR} \
|
||||
devel/py-test-cov${MODPY_FLAVOR} \
|
||||
www/py-requests-toolbelt${MODPY_FLAVOR}
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (CherryPy-17.4.2.tar.gz) = 7xYZrRYfUmdF1PDk5Rd1PZ2YWBTxKA4zBmEzPSugXN8=
|
||||
SIZE (CherryPy-17.4.2.tar.gz) = 684366
|
||||
SHA256 (CherryPy-18.4.0.tar.gz) = 5b4AMEyjA9d5HRS1zhQ2Qo4Yk5uRgGJQOHw2OuVsj48=
|
||||
SIZE (CherryPy-18.4.0.tar.gz) = 685507
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-cherrypy_test_test_encoding_py,v 1.1 2019/12/17 21:25:25 bket Exp $
|
||||
|
||||
Index: cherrypy/test/test_encoding.py
|
||||
--- cherrypy/test/test_encoding.py.orig
|
||||
+++ cherrypy/test/test_encoding.py
|
||||
@@ -2,7 +2,10 @@
|
||||
|
||||
import gzip
|
||||
import io
|
||||
-from unittest import mock
|
||||
+try:
|
||||
+ from unittest import mock
|
||||
+except:
|
||||
+ import mock
|
||||
|
||||
from six.moves.http_client import IncompleteRead
|
||||
from six.moves.urllib.parse import quote as url_quote
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-cherrypy_test_test_http_py,v 1.1 2019/12/17 21:25:25 bket Exp $
|
||||
|
||||
Index: cherrypy/test/test_http.py
|
||||
--- cherrypy/test/test_http.py.orig
|
||||
+++ cherrypy/test/test_http.py
|
||||
@@ -5,7 +5,10 @@ import errno
|
||||
import mimetypes
|
||||
import socket
|
||||
import sys
|
||||
-from unittest import mock
|
||||
+try:
|
||||
+ from unittest import mock
|
||||
+except:
|
||||
+ import mock
|
||||
|
||||
import six
|
||||
from six.moves.http_client import HTTPConnection
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-cherrypy_test_test_logging_py,v 1.1 2019/12/17 21:25:25 bket Exp $
|
||||
|
||||
Index: cherrypy/test/test_logging.py
|
||||
--- cherrypy/test/test_logging.py.orig
|
||||
+++ cherrypy/test/test_logging.py
|
||||
@@ -1,7 +1,10 @@
|
||||
"""Basic tests for the CherryPy core: request handling."""
|
||||
|
||||
import os
|
||||
-from unittest import mock
|
||||
+try:
|
||||
+ from unittest import mock
|
||||
+except:
|
||||
+ import mock
|
||||
|
||||
import six
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.14 2021/10/24 09:28:51 sthen Exp $
|
||||
@pkgpath www/py-CherryPy
|
||||
@comment $OpenBSD: PLIST,v 1.15 2022/02/25 12:15:41 sthen Exp $
|
||||
@conflict py-CherryPy-<17.4.2p1
|
||||
@conflict py-cherrypy2-*
|
||||
@pkgpath www/py-CherryPy
|
||||
bin/cherryd
|
||||
lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
|
||||
@ -32,6 +32,7 @@ lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cptree.${MODP
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpwsgi.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpwsgi_server.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_helper.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_json.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}daemon.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpchecker.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpcompat.py
|
||||
@ -49,6 +50,7 @@ lib/python${MODPY_VERSION}/site-packages/cherrypy/_cptree.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpwsgi.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpwsgi_server.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/_helper.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/_json.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/daemon.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/favicon.ico
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/
|
||||
@ -127,7 +129,6 @@ lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_auth
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_auth_digest.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_bus.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_caching.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_compat.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_config.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_config_server.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_conn.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
@ -186,7 +187,6 @@ lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_basic.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_digest.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_bus.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_caching.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_compat.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config_server.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_conn.py
|
||||
|
||||
Loading…
Reference in New Issue
Block a user