From f08b6a3baa7d2b0618679b875c6c9280c97dd9d3 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 25 Mar 2020 20:31:16 -0400 Subject: [PATCH 1/2] chore(ci): test only with grpcio wheels --- tox.ini | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 3a82bfb4269..45b7e49a96b 100644 --- a/tox.ini +++ b/tox.ini @@ -93,7 +93,13 @@ envlist = gevent_contrib-py{37,38}-gevent{13,14} # gevent 1.0 is not python 3 compatible gevent_contrib-{py27}-gevent{10} - grpc_contrib-{py27,py35,py36,py37,py38}-grpc{112,113,114,115,116,117,118,119,120,121,122} +# use grpcio versions with bdist_wheel packages for python versions +# py27,py35,py36: grpcio>=1.13.0 +# py37: grpcio>=1.13.0 +# py38: grpcio>=1.24.3 + grpc_contrib-{py27,py35,py36,py37}-grpc{,112,113,114,115,116,117,118,119,120,121,122} + grpc_contrib-{py37}-grpc{,113,114,115,116,117,118,119,120,121,122} + grpc_contrib-{py38}-grpc{,1243} httplib_contrib-{py27,py35,py36,py37,py38} jinja2_contrib-{py27,py35,py36,py37,py38}-jinja{27,28,29,210} mako_contrib-{py27,py35,py36,py37,py38}-mako{010,100} @@ -310,6 +316,7 @@ deps = gevent12: gevent>=1.2,<1.3 gevent13: gevent>=1.3,<1.4 gevent14: gevent>=1.4,<1.5 + grpc: grpcio grpc112: grpcio>=1.12.0,<1.13.0 grpc113: grpcio>=1.13.0,<1.14.0 grpc114: grpcio>=1.14.0,<1.15.0 @@ -321,6 +328,9 @@ deps = grpc120: grpcio>=1.20.0,<1.21.0 grpc121: grpcio>=1.21.0,<1.22.0 grpc122: grpcio>=1.22.0,<1.23.0 + grpc122: grpcio>=1.22.0,<1.23.0 + grpc1243: grpcio>=1.24.3,<1.25.0 + grpc: googleapis-common-protos grpc112: googleapis-common-protos grpc113: googleapis-common-protos grpc114: googleapis-common-protos @@ -332,6 +342,7 @@ deps = grpc120: googleapis-common-protos grpc121: googleapis-common-protos grpc122: googleapis-common-protos + grpc1243: googleapis-common-protos jinja27: jinja2>=2.7,<2.8 jinja28: jinja2>=2.8,<2.9 jinja29: jinja2>=2.9,<2.10 From 2351e8ead24aa767a9bd37f0f0ca4a9528b8cdfa Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 26 Mar 2020 10:52:12 -0400 Subject: [PATCH 2/2] fix --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 45b7e49a96b..ea07472c08a 100644 --- a/tox.ini +++ b/tox.ini @@ -97,7 +97,7 @@ envlist = # py27,py35,py36: grpcio>=1.13.0 # py37: grpcio>=1.13.0 # py38: grpcio>=1.24.3 - grpc_contrib-{py27,py35,py36,py37}-grpc{,112,113,114,115,116,117,118,119,120,121,122} + grpc_contrib-{py27,py35,py36}-grpc{,112,113,114,115,116,117,118,119,120,121,122} grpc_contrib-{py37}-grpc{,113,114,115,116,117,118,119,120,121,122} grpc_contrib-{py38}-grpc{,1243} httplib_contrib-{py27,py35,py36,py37,py38} @@ -328,7 +328,6 @@ deps = grpc120: grpcio>=1.20.0,<1.21.0 grpc121: grpcio>=1.21.0,<1.22.0 grpc122: grpcio>=1.22.0,<1.23.0 - grpc122: grpcio>=1.22.0,<1.23.0 grpc1243: grpcio>=1.24.3,<1.25.0 grpc: googleapis-common-protos grpc112: googleapis-common-protos