From b85fca25ee49b6fc794300fa458f20168b879bc8 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 3 Nov 2022 10:02:50 -0400 Subject: [PATCH] ci(gevent): pin greenlet for legacy gevent versions (#4437) Earlier versions of gevent (v1.1, v1.2, v1.3, v1.4, v20.9) only specify a minimum greenlet version. greenlet v2.0 updated its ABI to support py3.11 and is only compatible with gevent>=22.10.2.. This change updates gevent and opentracer tests to install greenlet<2 if gevent<=20.9 is used. Co-authored-by: Brett Langdon --- tox.ini | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 9300fffe356..d2bcb632030 100644 --- a/tox.ini +++ b/tox.ini @@ -36,10 +36,11 @@ envlist = dogpile_contrib-py{311}-dogpilecache{08,09,10,11,} futures_contrib-py27-futures{30,31,32,} futures_contrib-py{35,36,37,38,39,310,311} - gevent_contrib-py27-gevent{11,12,13}-sslmodules - gevent_contrib-py{35,36}-gevent{11,12,13}-sslmodules3-sslmodules - gevent_contrib-py{37,38}-gevent{13,14}-sslmodules3-sslmodules - gevent_contrib-py{39}-gevent{209,2012,211}-sslmodules3-sslmodules + gevent_contrib-py27-gevent{11,12,13}-greenlet1-sslmodules + gevent_contrib-py{35,36}-gevent{11,12,13}-greenlet1-sslmodules3-sslmodules + gevent_contrib-py{37,38}-gevent{13,14}-greenlet1-sslmodules3-sslmodules + gevent_contrib-py{39}-gevent209-greenlet1-sslmodules3-sslmodules + gevent_contrib-py{39}-gevent{2012,211}-sslmodules3-sslmodules gevent_contrib-py{310}-gevent{218}-sslmodules3-sslmodules gevent_contrib-py{311}-gevent{228}-sslmodules3-sslmodules kombu_contrib-py{27,35,36}-kombu{40,41,42,43,44,45,46,} @@ -69,21 +70,22 @@ envlist = py{27,35,36,37,38,39,310,311}-opentracer py{35,36,37,38,39,310,311}-opentracer_asyncio py{35,36,37,38,39,310,311}-opentracer_tornado-tornado{44,45,50,60,} - py{27,35,36}-opentracer_gevent-gevent{11,12} - py{37,38}-opentracer_gevent-gevent{13,14} - py{39}-opentracer_gevent-gevent{209,2012,211} + py{27,35,36}-opentracer_gevent-gevent{11,12}-greenlet1 + py{37,38}-opentracer_gevent-gevent{13,14}-greenlet1 + py{39}-opentracer_gevent-gevent209-greenlet1 + py{39}-opentracer_gevent-gevent{2012,211}-greenlet1 py{310,311}-opentracer_gevent-gevent{228} isolated_build = true requires = virtualenv<=20.2.1 -[testenv:gevent_contrib-py{37,38}-gevent{13,14}-sslmodules3-sslmodules] +[testenv:gevent_contrib-py{37,38}-gevent{13,14}-greenlet1-sslmodules3-sslmodules] # Wheels for gevent segfault pretty easily install_command=python -m pip install --no-binary=gevent {opts} {packages} usedevelop = true -[testenv:py{37,38}-opentracer_gevent-gevent{13,14}] +[testenv:py{37,38}-opentracer_gevent-gevent{13,14}-greenlet1] # Wheels for gevent segfault pretty easily install_command=python -m pip install --no-binary=gevent {opts} {packages} usedevelop = true @@ -132,8 +134,12 @@ deps = py{310}-profile-minreqs: protobuf==3.8.0 profile-minreqs: tenacity==5.0.1 profile-!minreqs-gevent: gevent + # gevent==1.1 requires greenlet<2 py27-profile-minreqs-gevent: gevent==1.1.0 + py27-profile-minreqs-gevent: greenlet<2 + # gevent==1.4 requires greenlet<2 py{35,36,37,38}-profile-minreqs-gevent: gevent==1.4.0 + py{35,36,37,38}-profile-minreqs-gevent: greenlet<2 py39-profile-minreqs-gevent: gevent==20.6.1; sys_platform != 'win32' py39-profile-minreqs-gevent: gevent==21.1.2; sys_platform == 'win32' py39-profile-minreqs-gevent: greenlet==0.4.16; sys_platform != 'win32' @@ -177,6 +183,9 @@ deps = gevent211: gevent>=21.1,<21.2 gevent218: gevent>=21.8,<21.9 gevent228: gevent>=22.8,<22.10 + # Note - gevent<20.12 does not set a maximum supported version. + # To test with gevent<20.12 we need to manually install greenlet<2. + greenlet1: greenlet>=1,<2 # kombu using deprecated shims removed in importlib-metadata 5.0 kombu{40,41,42,43,44,45,46,}: importlib_metadata<5.0; python_version<'3.8' kombu: kombu