subject:"add a py3 flavor to security\/py\-oauthlib"

Re: add a py3 flavor to security/py-oauthlib

2015-12-23 Thread Daniel Jakots

On Wed, 23 Dec 2015 20:41:03 +0100, Daniel Jakots
 wrote:

> This diff adds a py3 flavor to py-oauthlib. It needs the patch
> previously sent by shadchin@ on ports for devel/py-mock (because it
> adds the py3 flavor).

... which needs the py3 flavor from www/py-jwt. py-jwt collides but
sthen@ kindly solved the problem. His diff:

Index: Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile29 Sep 2015 10:52:55 -  1.3
+++ Makefile21 Dec 2015 21:49:53 -
@@ -3,26 +3,32 @@
 COMMENT =  JSON Web Token implementation in Python
 
 MODPY_EGG_VERSION = 1.3.0
+REVISION = 1
 DISTNAME = PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =  py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =   www
 MAINTAINER =   Johan Huldtgren 
-REVISION = 0
 
 HOMEPAGE = http://github.com/jpadilla/pyjwt
 
 # BSD
 PERMIT_PACKAGE_CDROM =  Yes
 
-MODPY_PI = Yes
-
 MODULES =  lang/python
+
+FLAVORS =  python3
+FLAVOR ?=
+
+MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS =   security/py-cryptography
+RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}
 
 # tests are available, but need pytest-runner plus dep's (which aren't in
 # tree) at build time; if adding these, remove patch-setup_py
 NO_TEST =  Yes
+
+post-install:
+   mv ${PREFIX}/bin/jwt ${PREFIX}/bin/jwt${MODPY_BIN_SUFFIX}
 
 .include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   26 Jun 2015 07:35:50 -  1.1.1.1
+++ pkg/PLIST   21 Dec 2015 21:49:53 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/26 07:35:50 landry Exp $
-bin/jwt
+bin/jwt${MODPY_BIN_SUFFIX}
 
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -9,28 +9,31 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/jwt/
 lib/python${MODPY_VERSION}/site-packages/jwt/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/__main__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__main__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.py
-lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/compat.py
-lib/python${MODPY_VERSION}/site-packages/jwt/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/${MODPY_PYCACHE}py_ecdsa.${MODPY_PYC_MAGIC_TAG}pyc

Re: add a py3 flavor to security/py-oauthlib

2015-12-23 Thread Johan Huldtgren


On 2015-12-23 15:02, Daniel Jakots wrote:

On Wed, 23 Dec 2015 20:41:03 +0100, Daniel Jakots
 wrote:


This diff adds a py3 flavor to py-oauthlib. It needs the patch
previously sent by shadchin@ on ports for devel/py-mock (because it
adds the py3 flavor).


... which needs the py3 flavor from www/py-jwt. py-jwt collides but
sthen@ kindly solved the problem. His diff:


this diff maintainer ok.

I've attached an updated diff for security/py-oauthlib, 'make test'
throws some warnings when ran under the python3 flavor, I patched
two of them away, the third one if fixed for python3 breaks python2
so I've left it with a note in the makefile.

.jh


Index: Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile29 Sep 2015 10:52:55 -  1.3
+++ Makefile21 Dec 2015 21:49:53 -
@@ -3,26 +3,32 @@
 COMMENT =  JSON Web Token implementation in Python

 MODPY_EGG_VERSION = 1.3.0
+REVISION = 1
 DISTNAME = PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =  py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =   www
 MAINTAINER =   Johan Huldtgren 
-REVISION = 0

 HOMEPAGE = http://github.com/jpadilla/pyjwt

 # BSD
 PERMIT_PACKAGE_CDROM =  Yes

-MODPY_PI = Yes
-
 MODULES =  lang/python
+
+FLAVORS =  python3
+FLAVOR ?=
+
+MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes

-RUN_DEPENDS =   security/py-cryptography
+RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}

 # tests are available, but need pytest-runner plus dep's (which aren't 
in

 # tree) at build time; if adding these, remove patch-setup_py
 NO_TEST =  Yes
+
+post-install:
+   mv ${PREFIX}/bin/jwt ${PREFIX}/bin/jwt${MODPY_BIN_SUFFIX}

 .include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   26 Jun 2015 07:35:50 -  1.1.1.1
+++ pkg/PLIST   21 Dec 2015 21:49:53 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/26 07:35:50 landry Exp $
-bin/jwt
+bin/jwt${MODPY_BIN_SUFFIX}

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -9,28 +9,31 @@ lib/python${MODPY_VERSION}/site-packages

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/jwt/
 lib/python${MODPY_VERSION}/site-packages/jwt/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/__main__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__main__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.py
-lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/compat.py
-lib/python${MODPY_VERSION}/site-packages/jwt/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/
 
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.py

-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.pyc

Re: add a py3 flavor to security/py-oauthlib

2015-12-23 Thread Stuart Henderson

On 2015/12/23 17:15, Johan Huldtgren wrote:
> On 2015-12-23 15:02, Daniel Jakots wrote:
> >On Wed, 23 Dec 2015 20:41:03 +0100, Daniel Jakots
> > wrote:
> >
> >>This diff adds a py3 flavor to py-oauthlib. It needs the patch
> >>previously sent by shadchin@ on ports for devel/py-mock (because it
> >>adds the py3 flavor).
> >
> >... which needs the py3 flavor from www/py-jwt. py-jwt collides but
> >sthen@ kindly solved the problem. His diff:
> 
> this diff maintainer ok.
> 
> I've attached an updated diff for security/py-oauthlib, 'make test'
> throws some warnings when ran under the python3 flavor, I patched
> two of them away, the third one if fixed for python3 breaks python2
> so I've left it with a note in the makefile.

Looks good for when the mock update is in.

add a py3 flavor to security/py-oauthlib

2015-12-23 Thread Daniel Jakots

Hi,

This diff adds a py3 flavor to py-oauthlib. It needs the patch
previously sent by shadchin@ on ports for devel/py-mock (because it
adds the py3 flavor).

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile29 Sep 2015 10:52:34 -  1.3
+++ Makefile23 Dec 2015 19:35:29 -
@@ -7,7 +7,7 @@ MODPY_EGG_VERSION = 1.0.3
 DISTNAME = py-oauthlib-${MODPY_EGG_VERSION}
 DISTFILES =${DISTNAME}{${MODPY_EGG_VERSION}}.tar.gz
 WRKDIST =  ${WRKDIR}/oauthlib-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   security
 MAINTAINER =   Johan Huldtgren 
@@ -20,14 +20,17 @@ MASTER_SITES =  https://github.com/idan/o
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS =  devel/py-blinker \
-   security/py-cryptography \
-   www/py-jwt
-
-TEST_DEPENDS = devel/py-nose \
-   devel/py-coverage \
-   devel/py-mock \
+RUN_DEPENDS =  devel/py-blinker${MODPY_FLAVOR} \
+   security/py-cryptography${MODPY_FLAVOR} \
+   www/py-jwt${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
+   devel/py-coverage${MODPY_FLAVOR} \
+   devel/py-mock${MODPY_FLAVOR} \
${RUN_DEPENDS}
+
+FLAVORS =  python3
+FLAVOR ?=
 
 post-extract:
chmod -R o+rX ${WRKSRC}
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   23 Sep 2015 21:14:21 -  1.2
+++ pkg/PLIST   23 Dec 2015 19:35:29 -
@@ -7,104 +7,113 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/oauthlib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}uri_validate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/common.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/common.pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}signature.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/
 
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}access_token.${MODPY_PYC_MAGIC_TAG}pyc

Re: add a py3 flavor to security/py-oauthlib

2015-12-23 Thread Daniel Jakots

On Wed, 23 Dec 2015 17:15:37 -0500, Johan Huldtgren
 wrote:

> I've attached an updated diff for security/py-oauthlib, 'make test'
> throws some warnings when ran under the python3 flavor, I patched
> two of them away, the third one if fixed for python3 breaks python2
> so I've left it with a note in the makefile.

Thanks!
I saw the warnings but I didn't read them carefully and thought they
were more complex than that, my bad.

Re: add a py3 flavor to security/py-oauthlib

Re: add a py3 flavor to security/py-oauthlib

Re: add a py3 flavor to security/py-oauthlib

add a py3 flavor to security/py-oauthlib

Re: add a py3 flavor to security/py-oauthlib

5 matches

Site Navigation

Mail list logo

Footer information