From ebb2d2cb69952b2f6822f674652a5966621119e0 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Fri, 18 Feb 2022 09:09:19 -0800 Subject: [PATCH 1/5] try fix ci by pinning markupsafe which introduced breaking changes in latest release --- eng/tox/tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini index 1c9df0ec9823..8ade3b7bb3b4 100644 --- a/eng/tox/tox.ini +++ b/eng/tox/tox.ini @@ -180,6 +180,7 @@ deps = recommonmark==0.6.0 mistune<2.0.0 m2r==0.2.1 + markupsafe==2.0.1 commands = {envbindir}/python {toxinidir}/../../../eng/tox/prep_sphinx_env.py -d {distdir} -t {toxinidir} {envbindir}/python {toxinidir}/../../../eng/tox/run_sphinx_apidoc.py \ From ea918ce9827955fb3157a265e85b3cb7412edf31 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Fri, 18 Feb 2022 10:10:42 -0800 Subject: [PATCH 2/5] try pinning markupsafe in ci_tools.txt --- eng/ci_tools.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/ci_tools.txt b/eng/ci_tools.txt index 24b933f43adf..f46be6564b3a 100644 --- a/eng/ci_tools.txt +++ b/eng/ci_tools.txt @@ -5,6 +5,7 @@ setuptools==46.4.0; python_version >= '3.5' virtualenv==20.0.23 wheel==0.37.0 Jinja2==2.11.2 +markupsafe==2.0.1 packaging==20.4 tox==3.15.0 tox-monorepo==0.1.2 From b6e9162c83d298b185235da8d3513958dc7c94c4 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Fri, 18 Feb 2022 10:18:45 -0800 Subject: [PATCH 3/5] ci_tools is not the right place --- eng/ci_tools.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/ci_tools.txt b/eng/ci_tools.txt index f46be6564b3a..24b933f43adf 100644 --- a/eng/ci_tools.txt +++ b/eng/ci_tools.txt @@ -5,7 +5,6 @@ setuptools==46.4.0; python_version >= '3.5' virtualenv==20.0.23 wheel==0.37.0 Jinja2==2.11.2 -markupsafe==2.0.1 packaging==20.4 tox==3.15.0 tox-monorepo==0.1.2 From 54edafdf0a6966e551826479453eb02b13c10934 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Fri, 18 Feb 2022 10:45:02 -0800 Subject: [PATCH 4/5] pin markupsafe old version for deprecated py2 steps --- eng/ci_tools.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/ci_tools.txt b/eng/ci_tools.txt index 24b933f43adf..e36079862312 100644 --- a/eng/ci_tools.txt +++ b/eng/ci_tools.txt @@ -19,6 +19,7 @@ pkginfo==1.5.0.1 pip==20.3.3 black==21.6b0; python_version >= '3.6' wrapt<=1.12.1; python_version == '2.7' +markupsafe==1.1.1; python_version=='2.7' # python 3.10 pinned packages cffi==1.15.0rc2; python_version >= '3.10' From aa022e52b37471601fc5191fc2487792eb716f84 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Fri, 18 Feb 2022 11:39:56 -0800 Subject: [PATCH 5/5] pinning markupsafe everywhere --- eng/ci_tools.txt | 3 ++- eng/regression_test_tools.txt | 2 ++ eng/regression_tools.txt | 2 ++ eng/test_tools.txt | 2 ++ eng/tox/tox.ini | 1 - 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/ci_tools.txt b/eng/ci_tools.txt index e36079862312..30fe4715a709 100644 --- a/eng/ci_tools.txt +++ b/eng/ci_tools.txt @@ -19,7 +19,8 @@ pkginfo==1.5.0.1 pip==20.3.3 black==21.6b0; python_version >= '3.6' wrapt<=1.12.1; python_version == '2.7' -markupsafe==1.1.1; python_version=='2.7' +markupsafe==2.0.1; python_version > '2.7' +markupsafe==1.1.1; python_version == '2.7' # python 3.10 pinned packages cffi==1.15.0rc2; python_version >= '3.10' diff --git a/eng/regression_test_tools.txt b/eng/regression_test_tools.txt index 13577f407c90..4cf5407b65d7 100644 --- a/eng/regression_test_tools.txt +++ b/eng/regression_test_tools.txt @@ -22,6 +22,8 @@ pyyaml==5.3.1 packaging==20.4 wheel==0.34.2 Jinja2==2.11.2 +markupsafe==2.0.1; python_version > '2.7' +markupsafe==1.1.1; python_version == '2.7' # Locking pylint and required packages pylint==1.8.4; python_version < '3.4' diff --git a/eng/regression_tools.txt b/eng/regression_tools.txt index 80987f36ebe5..93efc0812b7b 100644 --- a/eng/regression_tools.txt +++ b/eng/regression_tools.txt @@ -20,6 +20,8 @@ beautifulsoup4==4.9.1 pkginfo==1.5.0.1 pip==20.2 black==21.6b0; python_version >= '3.6' +markupsafe==2.0.1; python_version > '2.7' +markupsafe==1.1.1; python_version == '2.7' # locking packages defined as deps from azure-sdk-tools or azure-devtools pytoml==0.1.21 diff --git a/eng/test_tools.txt b/eng/test_tools.txt index 6e74beda2a09..a2cf73855c6b 100644 --- a/eng/test_tools.txt +++ b/eng/test_tools.txt @@ -28,6 +28,8 @@ six==1.14.0 pyyaml==5.3.1 packaging==20.4 Jinja2==2.11.2 +markupsafe==2.0.1; python_version > '2.7' +markupsafe==1.1.1; python_version == '2.7' wrapt==1.12.1 # Locking pylint and required packages diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini index 8ade3b7bb3b4..1c9df0ec9823 100644 --- a/eng/tox/tox.ini +++ b/eng/tox/tox.ini @@ -180,7 +180,6 @@ deps = recommonmark==0.6.0 mistune<2.0.0 m2r==0.2.1 - markupsafe==2.0.1 commands = {envbindir}/python {toxinidir}/../../../eng/tox/prep_sphinx_env.py -d {distdir} -t {toxinidir} {envbindir}/python {toxinidir}/../../../eng/tox/run_sphinx_apidoc.py \