hello,

update of py-oauthlib from 2.1.0 to 3.1.0

full changelog is here:
https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst

Drop python2 FLAVOR. Built, packaged, tested on amd64 with no issues.
Consumers are www/py-request-oauthlib and audio/py-discogs-client,
updates to each of those in separate emails.

thanks,

.jh
Index: security/Makefile
===================================================================
RCS file: /cvs/ports/security/Makefile,v
retrieving revision 1.567
diff -u -p -u -p -r1.567 Makefile
--- security/Makefile   29 Feb 2020 07:59:50 -0000      1.567
+++ security/Makefile   29 Feb 2020 18:05:14 -0000
@@ -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
Index: security/py-oauthlib/Makefile
===================================================================
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- security/py-oauthlib/Makefile       8 Nov 2019 09:09:19 -0000       1.16
+++ security/py-oauthlib/Makefile       29 Feb 2020 18:05:18 -0000
@@ -2,14 +2,13 @@
 
 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 <jhuldtg...@gmail.com>
@@ -29,12 +28,8 @@ TEST_DEPENDS =       devel/py-coverage${MODPY_
                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>
Index: security/py-oauthlib/distinfo
===================================================================
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- security/py-oauthlib/distinfo       1 Jul 2018 06:28:12 -0000       1.10
+++ security/py-oauthlib/distinfo       29 Feb 2020 18:05:18 -0000
@@ -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
Index: 
security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
===================================================================
RCS file: 
security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
diff -N 
security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 
security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
   29 Feb 2020 18:05:18 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+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'])
Index: security/py-oauthlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- security/py-oauthlib/pkg/PLIST      1 Oct 2016 15:20:08 -0000       1.4
+++ security/py-oauthlib/pkg/PLIST      29 Feb 2020 18:05:18 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.4 2016/10/01 15:20:08 danj Exp $
+@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 +85,16 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 
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 +108,59 @@ lib/python${MODPY_VERSION}/site-packages
 
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

Reply via email to