Skip to content

Commit 662fcd2

Browse files
authored
fix more_itertools in ci (#3002)
* fix more_itertools in ci * move pytest itertools * move to top level venv for tests * fix flask * fix flask 2 * cherrypy fix 1 * fix flask_cache
1 parent 841df91 commit 662fcd2

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

riotfile.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
272272
Venv(
273273
name="celery",
274274
command="pytest {cmdargs} tests/contrib/celery",
275-
pkgs={"pytest": "~=3.10"},
275+
pkgs={"pytest": "~=3.10", "more_itertools": "<8.11.0"},
276276
venvs=[
277277
# Non-4.x celery should be able to use the older redis lib, since it locks to an older kombu
278278
Venv(
@@ -368,12 +368,14 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
368368
">=16,<17",
369369
">=17,<18",
370370
],
371+
"more_itertools": "<8.11.0",
371372
},
372373
),
373374
Venv(
374375
pys=select_pys(min_version="3.5"),
375376
pkgs={
376377
"cherrypy": [">=18.0,<19", latest],
378+
"more_itertools": "<8.11.0",
377379
},
378380
),
379381
],
@@ -607,16 +609,15 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
607609
Venv(
608610
name="flask",
609611
command="pytest {cmdargs} tests/contrib/flask",
610-
pkgs={
611-
"blinker": latest,
612-
},
612+
pkgs={"blinker": latest},
613613
venvs=[
614614
# Flask == 0.12.0
615615
Venv(
616616
pys=select_pys(),
617617
pkgs={
618618
"flask": ["~=0.12.0"],
619619
"pytest": "~=3.0",
620+
"more_itertools": "<8.11.0",
620621
},
621622
),
622623
Venv(
@@ -626,10 +627,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
626627
"DATADOG_SERVICE_NAME": "test.flask.service",
627628
"DATADOG_PATCH_MODULES": "jinja2:false",
628629
},
629-
pkgs={
630-
"flask": ["~=0.12.0"],
631-
"pytest": "~=3.0",
632-
},
630+
pkgs={"flask": ["~=0.12.0"], "pytest": "~=3.0", "more_itertools": "<8.11.0"},
633631
),
634632
# Flask 1.x.x
635633
Venv(
@@ -702,6 +700,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
702700
"Flask-Cache": ["~=0.12.0"],
703701
"werkzeug": "<1.0",
704702
"pytest": "~=3.0",
703+
"more_itertools": "<8.11.0",
705704
},
706705
),
707706
Venv(
@@ -712,6 +711,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
712711
"Flask-Cache": ["~=0.13.0", latest],
713712
"werkzeug": "<1.0",
714713
"pytest": "~=3.0",
714+
"more_itertools": "<8.11.0",
715715
},
716716
),
717717
Venv(
@@ -1026,6 +1026,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
10261026
latest,
10271027
],
10281028
"msgpack": latest,
1029+
"more_itertools": "<8.11.0",
10291030
},
10301031
),
10311032
],

0 commit comments

Comments
 (0)