From 0e49cc4758f6d1bc24a530dbc7b8b051eccd33d2 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Wed, 20 Jan 2021 23:59:49 +0000 Subject: [PATCH 1/3] Bump pyyaml from 5.3.1 to 5.4.1 --- sonic-slave-buster/Dockerfile.j2 | 4 ++-- sonic-slave-stretch/Dockerfile.j2 | 4 ++-- src/sonic-bgpcfgd/setup.py | 2 +- src/sonic-config-engine/setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 0890f0b68c6b..749cdfd4ac1c 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -429,8 +429,8 @@ RUN pip3 uninstall -y enum34 RUN pip2 install j2cli==0.3.10 # For sonic-mgmt-framework -RUN pip2 install "PyYAML==5.3.1" -RUN pip3 install "PyYAML==5.3.1" +RUN pip2 install "PyYAML==5.4.1" +RUN pip3 install "PyYAML==5.4.1" RUN pip2 install "lxml==4.6.2" RUN pip3 install "lxml==4.6.2" diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index 103a9cd77831..2096ba0dcf7f 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -346,8 +346,8 @@ RUN pip2 install j2cli==0.3.10 RUN pip3 install mockredispy==2.9.3 # For sonic-mgmt-framework -RUN pip2 install "PyYAML==5.3.1" -RUN pip3 install "PyYAML==5.3.1" +RUN pip2 install "PyYAML==5.4.1" +RUN pip3 install "PyYAML==5.4.1" RUN pip2 install "lxml==4.6.2" RUN pip3 install "lxml==4.6.2" diff --git a/src/sonic-bgpcfgd/setup.py b/src/sonic-bgpcfgd/setup.py index d6290bccb2b3..ab86ca20ec19 100755 --- a/src/sonic-bgpcfgd/setup.py +++ b/src/sonic-bgpcfgd/setup.py @@ -17,7 +17,7 @@ install_requires = [ 'jinja2>=2.10', 'netaddr==0.8.0', - 'pyyaml==5.3.1', + 'pyyaml==5.4.1', ], setup_requires = [ 'pytest-runner', diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py index c9dfd3609b92..d167e0566438 100644 --- a/src/sonic-config-engine/setup.py +++ b/src/sonic-config-engine/setup.py @@ -9,7 +9,7 @@ 'ipaddress==1.0.23', 'lxml==4.6.2', 'netaddr==0.8.0', - 'pyyaml==5.3.1', + 'pyyaml==5.4.1', 'sonic-py-common', ] From c0b413c0d32dac8ddd238b7f16c39e6ed33f5a43 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Mon, 25 Jan 2021 01:48:30 +0000 Subject: [PATCH 2/3] Keep PyYAML==5.3.1 in sonic-slave-stretch due to python3.5 --- sonic-slave-stretch/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index 2096ba0dcf7f..103a9cd77831 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -346,8 +346,8 @@ RUN pip2 install j2cli==0.3.10 RUN pip3 install mockredispy==2.9.3 # For sonic-mgmt-framework -RUN pip2 install "PyYAML==5.4.1" -RUN pip3 install "PyYAML==5.4.1" +RUN pip2 install "PyYAML==5.3.1" +RUN pip3 install "PyYAML==5.3.1" RUN pip2 install "lxml==4.6.2" RUN pip3 install "lxml==4.6.2" From 42bfa916a3274655457b3ade0372eca8a8813f0f Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Tue, 26 Jan 2021 02:59:50 +0000 Subject: [PATCH 3/3] Change another pyyaml dependency version --- src/sonic-frr-mgmt-framework/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-frr-mgmt-framework/setup.py b/src/sonic-frr-mgmt-framework/setup.py index d8681d1bbd88..d3c9f1dae173 100755 --- a/src/sonic-frr-mgmt-framework/setup.py +++ b/src/sonic-frr-mgmt-framework/setup.py @@ -14,7 +14,7 @@ install_requires = [ 'jinja2>=2.10', 'netaddr==0.8.0', - 'pyyaml==5.3.1', + 'pyyaml==5.4.1', 'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to import too new of a version for Python 2 ], setup_requires = [