Update security/py-oauthlib 2.1.0 -> 3.1.0

Drop python2 FLAVOR

From Johan Huldtgren (maintainer)
This commit is contained in:
kmos 2020-02-29 19:34:27 +00:00
parent 87ad4b4b94
commit 7115c3f085
5 changed files with 86 additions and 15 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.567 2020/02/29 07:59:50 tb Exp $
# $OpenBSD: Makefile,v 1.568 2020/02/29 19:34:27 kmos Exp $
SUBDIR =
SUBDIR += ADMsnmp
@ -310,7 +310,6 @@
SUBDIR += py-miasm
SUBDIR += py-openssl
SUBDIR += py-openssl,python3
SUBDIR += py-oauthlib
SUBDIR += py-oauthlib,python3
SUBDIR += py-paramiko
SUBDIR += py-paramiko,python3

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.16 2019/11/08 09:09:19 kmos Exp $
# $OpenBSD: Makefile,v 1.17 2020/02/29 19:34:27 kmos Exp $
COMMENT = Python library for OAuth
MODPY_EGG_VERSION = 2.1.0
MODPY_EGG_VERSION = 3.1.0
GH_ACCOUNT = idan
GH_PROJECT = oauthlib
GH_TAGNAME = v${MODPY_EGG_VERSION}
PKGNAME = py-oauthlib-${MODPY_EGG_VERSION}
REVISION = 0
CATEGORIES = security
MAINTAINER = Johan Huldtgren <jhuldtgren@gmail.com>
@ -29,12 +28,8 @@ TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
devel/py-mock${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR ?=
FLAVOR = python3
FIX_EXTRACT_PERMISSIONS = Yes
# tests/oauth2/rfc5849/endpoints/test_error_responses.py
# will throw a warning when make test is run under
# the python3 flavor, fixing this breaks python2 though.
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (oauthlib-2.1.0.tar.gz) = q91fFJCn+n1R89Wdg+nBZznVYhzETXUOMiRtLuLiTyQ=
SIZE (oauthlib-2.1.0.tar.gz) = 164989
SHA256 (oauthlib-3.1.0.tar.gz) = QeihlgRruM0m+HDI/Ccd4Roj5WzQSRspkDkXAg5j3cY=
SIZE (oauthlib-3.1.0.tar.gz) = 208920

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py,v 1.1 2020/02/29 19:34:27 kmos Exp $
Index: tests/oauth2/rfc6749/endpoints/test_error_responses.py
--- tests/oauth2/rfc6749/endpoints/test_error_responses.py.orig
+++ tests/oauth2/rfc6749/endpoints/test_error_responses.py
@@ -179,21 +179,21 @@ class ErrorResponseTest(TestCase):
description = 'Duplicate client_id parameter.'
# Authorization code
- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
+ self.assertRaisesRegex(errors.InvalidRequestFatalError,
description,
self.web.validate_authorization_request,
uri.format('code'))
- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
+ self.assertRaisesRegex(errors.InvalidRequestFatalError,
description,
self.web.create_authorization_response,
uri.format('code'), scopes=['foo'])
# Implicit grant
- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
+ self.assertRaisesRegex(errors.InvalidRequestFatalError,
description,
self.mobile.validate_authorization_request,
uri.format('token'))
- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
+ self.assertRaisesRegex(errors.InvalidRequestFatalError,
description,
self.mobile.create_authorization_response,
uri.format('token'), scopes=['foo'])

View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2016/10/01 15:20:08 danj Exp $
@comment $OpenBSD: PLIST,v 1.5 2020/02/29 19:34:28 kmos Exp $
@conflict py-oauthlib-*
@pkgpath security/py-oauthlib
lib/python${MODPY_VERSION}/site-packages/oauthlib/
lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -84,12 +86,16 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}authorization.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}introspect.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}revocation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/authorization.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/base.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/introspect.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/metadata.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/resource.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/revocation.py
@ -103,19 +109,59 @@ lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${M
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}client_credentials.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}openid_connect.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}refresh_token.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}resource_owner_password_credentials.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/base.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/implicit.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/openid_connect.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/parameters.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/request_validator.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/tokens.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/utils.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}userinfo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/pre_configured.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/userinfo.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/exceptions.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}authorization_code.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/authorization_code.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/base.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/dispatchers.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/exceptions.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/hybrid.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/implicit.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/request_validator.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/tokens.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/signals.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/uri_validate.py