Re: [update] www/py-requests-oauthlib

Johan Huldtgren Sat, 29 Feb 2020 10:56:45 -0800

On 2020-02-29 13:14, Johan Huldtgren wrote:
> hello,
> 
> update to py-requests-oauthlib from 1.0.0 to 1.3.0
> 
> full changelog is here:
> https://github.com/requests/requests-oauthlib/blob/master/HISTORY.rst
> 
> Drop python2 FLAVOR, only consumer vdirsyncer is already python3 only.
> Built, packaged, and tested (with vdirsyncer) on amd64 with no issues.


Now with 100% more @conflict markers.

.jh

> Index: www/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/Makefile,v
> retrieving revision 1.947
> diff -u -p -u -p -r1.947 Makefile
> --- www/Makefile      25 Feb 2020 20:29:28 -0000      1.947
> +++ www/Makefile      29 Feb 2020 17:30:51 -0000
> @@ -468,7 +468,6 @@
>       SUBDIR += py-requests-futures,python3
>       SUBDIR += py-requests-mock
>       SUBDIR += py-requests-mock,python3
> -     SUBDIR += py-requests-oauthlib
>       SUBDIR += py-requests-oauthlib,python3
>       SUBDIR += py-requests-toolbelt
>       SUBDIR += py-requests-toolbelt,python3
> Index: www/py-requests-oauthlib/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/py-requests-oauthlib/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- www/py-requests-oauthlib/Makefile 12 Jul 2019 20:51:03 -0000      1.5
> +++ www/py-requests-oauthlib/Makefile 29 Feb 2020 17:31:00 -0000
> @@ -2,10 +2,9 @@
>  
>  COMMENT =            OAuth library support for python-requests
>  
> -MODPY_EGG_VERSION =  1.0.0
> +MODPY_EGG_VERSION =  1.3.0
>  DISTNAME =           requests-oauthlib-${MODPY_EGG_VERSION}
>  PKGNAME =            py-${DISTNAME}
> -REVISION =           0
>  
>  CATEGORIES =         www
>  
> @@ -28,7 +27,7 @@ MODPY_SETUPTOOLS =  Yes
>  MODPY_PYTEST =               Yes
>  
>  FLAVORS =            python3
> -FLAVOR ?=
> +FLAVOR =             python3
>  
>  pre-test:
>       rm -rf ${WRKSRC}/tests/__pycache__
> Index: www/py-requests-oauthlib/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/py-requests-oauthlib/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- www/py-requests-oauthlib/distinfo 14 Aug 2018 05:56:19 -0000      1.1.1.1
> +++ www/py-requests-oauthlib/distinfo 29 Feb 2020 17:31:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (requests-oauthlib-1.0.0.tar.gz) = 
> iIa/7FrXr7OR7VRDsfaXxvSumNDlYgg52LRJnAMq2j8=
> -SIZE (requests-oauthlib-1.0.0.tar.gz) = 74092
> +SHA256 (requests-oauthlib-1.3.0.tar.gz) = 
> tCYWAacf1yGovW16ocwdaoqTtKn16WYm+OTZHovuqmo=
> +SIZE (requests-oauthlib-1.3.0.tar.gz) = 88157
> Index: www/py-requests-oauthlib/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/py-requests-oauthlib/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- www/py-requests-oauthlib/pkg/PLIST        14 Aug 2018 05:56:19 -0000      
> 1.1.1.1
> +++ www/py-requests-oauthlib/pkg/PLIST        29 Feb 2020 17:31:00 -0000
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2018/08/14 05:56:19 remi Exp $
> +@pkgpath www/py-requests-oauthlib
>  lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -21,6 +22,7 @@ lib/python${MODPY_VERSION}/site-packages
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}douban.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}facebook.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}fitbit.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}instagram.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}linkedin.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}mailchimp.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}plentymarkets.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -29,6 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/douban.py
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/facebook.py
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/fitbit.py
> +lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/instagram.py
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/linkedin.py
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/mailchimp.py
>  
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/plentymarkets.py

Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.947
diff -u -p -u -p -r1.947 Makefile
--- www/Makefile        25 Feb 2020 20:29:28 -0000      1.947
+++ www/Makefile        29 Feb 2020 18:50:49 -0000
@@ -468,7 +468,6 @@
      SUBDIR += py-requests-futures,python3
      SUBDIR += py-requests-mock
      SUBDIR += py-requests-mock,python3
-     SUBDIR += py-requests-oauthlib
      SUBDIR += py-requests-oauthlib,python3
      SUBDIR += py-requests-toolbelt
      SUBDIR += py-requests-toolbelt,python3
Index: www/py-requests-oauthlib/Makefile
===================================================================
RCS file: /cvs/ports/www/py-requests-oauthlib/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- www/py-requests-oauthlib/Makefile   12 Jul 2019 20:51:03 -0000      1.5
+++ www/py-requests-oauthlib/Makefile   29 Feb 2020 18:50:56 -0000
@@ -2,10 +2,9 @@
 
 COMMENT =              OAuth library support for python-requests
 
-MODPY_EGG_VERSION =    1.0.0
+MODPY_EGG_VERSION =    1.3.0
 DISTNAME =             requests-oauthlib-${MODPY_EGG_VERSION}
 PKGNAME =              py-${DISTNAME}
-REVISION =             0
 
 CATEGORIES =           www
 
@@ -28,7 +27,7 @@ MODPY_SETUPTOOLS =    Yes
 MODPY_PYTEST =         Yes
 
 FLAVORS =              python3
-FLAVOR ?=
+FLAVOR =               python3
 
 pre-test:
        rm -rf ${WRKSRC}/tests/__pycache__
Index: www/py-requests-oauthlib/distinfo
===================================================================
RCS file: /cvs/ports/www/py-requests-oauthlib/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- www/py-requests-oauthlib/distinfo   14 Aug 2018 05:56:19 -0000      1.1.1.1
+++ www/py-requests-oauthlib/distinfo   29 Feb 2020 18:50:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (requests-oauthlib-1.0.0.tar.gz) = 
iIa/7FrXr7OR7VRDsfaXxvSumNDlYgg52LRJnAMq2j8=
-SIZE (requests-oauthlib-1.0.0.tar.gz) = 74092
+SHA256 (requests-oauthlib-1.3.0.tar.gz) = 
tCYWAacf1yGovW16ocwdaoqTtKn16WYm+OTZHovuqmo=
+SIZE (requests-oauthlib-1.3.0.tar.gz) = 88157
Index: www/py-requests-oauthlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-requests-oauthlib/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- www/py-requests-oauthlib/pkg/PLIST  14 Aug 2018 05:56:19 -0000      1.1.1.1
+++ www/py-requests-oauthlib/pkg/PLIST  29 Feb 2020 18:50:56 -0000
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2018/08/14 05:56:19 remi Exp $
+@conflict py-requests-oauthlib-*
+@pkgpath www/py-requests-oauthlib
 lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -21,6 +23,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}douban.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}facebook.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}fitbit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}instagram.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}linkedin.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}mailchimp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}plentymarkets.${MODPY_PYC_MAGIC_TAG}pyc
@@ -29,6 +32,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/douban.py
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/facebook.py
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/fitbit.py
+lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/instagram.py
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/linkedin.py
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/mailchimp.py
 
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/plentymarkets.py

Re: [update] www/py-requests-oauthlib

Reply via email to