Skip to content

Commit bb37af8

Browse files
brettlangdonbrettlangdon
authored
fix(ci): pin itsdangerous and markupsafe to avoid breaking change (#3294)
`itsdangerous>=2.0` and `markupsafe>=2.0` introduced a breaking change and older versions of `flask` and `jnija2` do not restrict upper bound on version. This change pins `itsdangerous` and `markupsafe` for test environments for `jinja2` and older versions of `flask`
1 parent c404513 commit bb37af8

File tree

1 file changed

+63
-3
lines changed

1 file changed

+63
-3
lines changed

‎riotfile.py‎

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,12 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
717717
"flask": ["~=0.12.0"],
718718
"pytest": "~=3.0",
719719
"more_itertools": "<8.11.0",
720+
# https://github.com/pallets/itsdangerous/issues/290
721+
# DEV: Breaking change made in 2.0 release
722+
"itsdangerous": "<2.0",
723+
# https://github.com/pallets/markupsafe/issues/282
724+
# DEV: Breaking change made in 2.1.0 release
725+
"markupsafe": "<2.0",
720726
},
721727
),
722728
Venv(
@@ -727,7 +733,17 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
727733
"DATADOG_SERVICE_NAME": "test.flask.service",
728734
"DATADOG_PATCH_MODULES": "jinja2:false",
729735
},
730-
pkgs={"flask": ["~=0.12.0"], "pytest": "~=3.0", "more_itertools": "<8.11.0"},
736+
pkgs={
737+
"flask": ["~=0.12.0"],
738+
"pytest": "~=3.0",
739+
"more_itertools": "<8.11.0",
740+
# https://github.com/pallets/itsdangerous/issues/290
741+
# DEV: Breaking change made in 2.0 release
742+
"itsdangerous": "<2.0",
743+
# https://github.com/pallets/markupsafe/issues/282
744+
# DEV: Breaking change made in 2.1.0 release
745+
"markupsafe": "<2.0",
746+
},
731747
),
732748
# Flask 1.x.x
733749
Venv(
@@ -738,6 +754,12 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
738754
"~=1.1.0",
739755
"~=1.0", # latest 1.x
740756
],
757+
# https://github.com/pallets/itsdangerous/issues/290
758+
# DEV: Breaking change made in 2.1.0 release
759+
"itsdangerous": "<2.1.0",
760+
# https://github.com/pallets/markupsafe/issues/282
761+
# DEV: Breaking change made in 2.1.0 release
762+
"markupsafe": "<2.0",
741763
},
742764
),
743765
Venv(
@@ -754,6 +776,12 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
754776
"~=1.1.0",
755777
"~=1.0", # latest 1.x
756778
],
779+
# https://github.com/pallets/itsdangerous/issues/290
780+
# DEV: Breaking change made in 2.0 release
781+
"itsdangerous": "<2.0",
782+
# https://github.com/pallets/markupsafe/issues/282
783+
# DEV: Breaking change made in 2.1.0 release
784+
"markupsafe": "<2.0",
757785
},
758786
),
759787
# Flask >= 2.0.0
@@ -804,6 +832,12 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
804832
"werkzeug": "<1.0",
805833
"pytest": "~=3.0",
806834
"more_itertools": "<8.11.0",
835+
# https://github.com/pallets/itsdangerous/issues/290
836+
# DEV: Breaking change made in 2.0 release
837+
"itsdangerous": "<2.0",
838+
# https://github.com/pallets/markupsafe/issues/282
839+
# DEV: Breaking change made in 2.1.0 release
840+
"markupsafe": "<2.0",
807841
},
808842
),
809843
Venv(
@@ -815,13 +849,32 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
815849
"werkzeug": "<1.0",
816850
"pytest": "~=3.0",
817851
"more_itertools": "<8.11.0",
852+
# https://github.com/pallets/itsdangerous/issues/290
853+
# DEV: Breaking change made in 2.0 release
854+
"itsdangerous": "<2.0",
855+
# https://github.com/pallets/markupsafe/issues/282
856+
# DEV: Breaking change made in 2.1.0 release
857+
"markupsafe": "<2.0",
818858
},
819859
),
820860
Venv(
821861
pys=select_pys(min_version="3"),
822862
pkgs={
823863
"flask": ["~=1.0.0", "~=1.1.0", latest],
824864
"flask-caching": ["~=1.10.0", latest],
865+
# https://github.com/pallets/itsdangerous/issues/290
866+
# DEV: Breaking change made in 2.0 release
867+
"itsdangerous": "<2.0",
868+
# https://github.com/pallets/markupsafe/issues/282
869+
# DEV: Breaking change made in 2.1.0 release
870+
"markupsafe": "<2.0",
871+
},
872+
),
873+
Venv(
874+
pys=select_pys(min_version="3"),
875+
pkgs={
876+
"flask": [latest],
877+
"flask-caching": ["~=1.10.0", latest],
825878
},
826879
),
827880
],
@@ -1362,11 +1415,18 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
13621415
venvs=[
13631416
Venv(
13641417
pys=select_pys(max_version="3.9"),
1365-
pkgs={"jinja2": [("~=2.%d.0" % m) for m in range(7, 12)]},
1418+
pkgs={
1419+
"jinja2": [("~=2.%d.0" % m) for m in range(9, 12)],
1420+
# https://github.com/pallets/markupsafe/issues/282
1421+
# DEV: Breaking change made in 2.1.0 release
1422+
"markupsafe": "<2.0",
1423+
},
13661424
),
13671425
Venv(
13681426
pys=select_pys(min_version="3.6"),
1369-
pkgs={"jinja2": ["~=3.0.0", latest]},
1427+
pkgs={
1428+
"jinja2": ["~=3.0.0", latest],
1429+
},
13701430
),
13711431
],
13721432
command="pytest {cmdargs} tests/contrib/jinja2",

0 commit comments

Comments
 (0)