Hi ports@,
This is an update of www/py-requests-toolbelt to 0.9.1.
It is required for an update of www/py-httpie that I'll send on another
email.
All consumers have the same behaviour on regression tests before and
after the upgrade.
I did not try to make it python3 only because it has one python2
dependency (www/py-CherryPy) which, in turn, is a dependency of
textproc/calibre and sysutils/salt.
Updated HOMEPAGE and marked tests as interactive, as it tries to make
network connections now. Those 3 tests are the only ones that fail.
Ok to commit ?
diff e89b343512c111113aa228c44100e302fd480d1c /usr/ports
blob - 9457ef7c6f4da93a20bb1efd56542b7534837111
file + www/py-requests-toolbelt/Makefile
--- www/py-requests-toolbelt/Makefile
+++ www/py-requests-toolbelt/Makefile
@@ -2,14 +2,13 @@
COMMENT = utility belt for advanced users of python-requests
-MODPY_EGG_VERSION = 0.7.1
+MODPY_EGG_VERSION = 0.9.1
DISTNAME = requests-toolbelt-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = www
-HOMEPAGE = https://github.com/sigmavirus24/requests-toolbelt
+HOMEPAGE = https://github.com/requests/toolbelt
# APLv2
PERMIT_PACKAGE = Yes
@@ -28,4 +27,11 @@ FLAVOR ?=
TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
www/py-betamax${MODPY_FLAVOR}
+.if !${FLAVOR:Mpython3}
+TEST_DEPENDS += security/py-openssl
+.endif
+
+# requires network access
+TEST_IS_INTERACTIVE = Yes
+
.include <bsd.port.mk>
blob - d9b963c1289da800805b783db90420894e4995e8
file + www/py-requests-toolbelt/distinfo
--- www/py-requests-toolbelt/distinfo
+++ www/py-requests-toolbelt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (requests-toolbelt-0.7.1.tar.gz) =
w4Q4hCadeeSSUi8+n0kJF+B0wd27gBEZaJcOch/jbq8=
-SIZE (requests-toolbelt-0.7.1.tar.gz) = 194670
+SHA256 (requests-toolbelt-0.9.1.tar.gz) =
loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A=
+SIZE (requests-toolbelt-0.9.1.tar.gz) = 207286
blob - 431392f6912004b88550707296faada78c7a9c42
file + /dev/null
---
www/py-requests-toolbelt/patches/patch-requests_toolbelt_adapters_socket_options_py
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-requests_toolbelt_adapters_socket_options_py,v 1.1.1.1
2017/03/17 07:48:46 sthen Exp $
---- requests_toolbelt/adapters/socket_options.py.orig Fri Mar 17 07:42:45 2017
-+++ requests_toolbelt/adapters/socket_options.py Fri Mar 17 07:43:47 2017
-@@ -104,14 +104,19 @@ class TCPKeepAliveAdapter(SocketOptionsAdapter):
- count = kwargs.pop('count', 5)
- socket_options = socket_options + [
- (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
-- (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, interval),
-- (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, count),
- ]
-
- # NOTE(Ian): Apparently OSX does not have this constant defined, so we
- # set it conditionally.
- if getattr(socket, 'TCP_KEEPIDLE', None) is not None:
- socket_options += [(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE,
idle)]
-+
-+ # ...same for OpenBSD and these two:
-+ if getattr(socket, 'TCP_KEEPINTVL', None) is not None:
-+ socket_options += [(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL,
idle)]
-+
-+ if getattr(socket, 'TCP_KEEPCNT', None) is not None:
-+ socket_options += [(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, idle)]
-
- super(TCPKeepAliveAdapter, self).__init__(
- socket_options=socket_options, **kwargs
blob - /dev/null
file +
www/py-requests-toolbelt/patches/patch-tests_test_socket_options_adapter_py
--- /dev/null
+++ www/py-requests-toolbelt/patches/patch-tests_test_socket_options_adapter_py
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: tests/test_socket_options_adapter.py
+--- tests/test_socket_options_adapter.py.orig
++++ tests/test_socket_options_adapter.py
+@@ -76,8 +76,6 @@ def test_keep_alive_on_newer_requests_no_idle(PoolMana
+ socket_opts = [
+ (socket.IPPROTO_TCP, socket.TCP_NODELAY, 1),
+ (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+- (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 10),
+- (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 10),
+ ]
+ with remove_keepidle():
+ adapter = socket_options.TCPKeepAliveAdapter(
+@@ -101,8 +99,6 @@ def test_keep_alive_on_newer_requests_with_idle(PoolMa
+ socket_opts = [
+ (socket.IPPROTO_TCP, socket.TCP_NODELAY, 1),
+ (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+- (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 10),
+- (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 10),
+ (socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 30),
+ ]
+ adapter = socket_options.TCPKeepAliveAdapter(
blob - a4b56da2f3fa724203ec16d826daf79e6bbdd45d
file + www/py-requests-toolbelt/pkg/PLIST
--- www/py-requests-toolbelt/pkg/PLIST
+++ www/py-requests-toolbelt/pkg/PLIST
@@ -24,12 +24,14 @@ lib/python${MODPY_VERSION}/site-packages/requests_tool
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}socket_options.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}x509.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/appengine.py
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/fingerprint.py
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/host_header_ssl.py
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/socket_options.py
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/source.py
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/ssl.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/x509.py
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/
lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/${MODPY_PYCACHE}/
--
Paco Esteban.
0x5818130B8A6DBC03
