scottk/ols-nos
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/ols-nos.git synced 2025-12-23 16:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build]: Fix sonic-cfggen contextlib err (#7996)

Browse Source 
A recent version of contextlib2 (https://pypi.org/project/contextlib2/21.6.0/#history) has broken Python2 compatibility, so the version picked up by netaddr when using Python2 must be specified, or else builds fail

Co-authored-by: Tom Zhu <tom.zhu@metaswitch.com>
This commit is contained in:
thomas.cappleman@metaswitch.com
2021-06-29 01:15:03 +01:00
committed by GitHub
parent 1d9fd820a3
commit 101b1fa08b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dockers/docker-sonic-mgmt/Dockerfile.j2
View File

@@ -34,6 +34,7 @@ RUN apt-get update && apt-get install -y build-essential \
vim vim
RUN pip install cffi==1.10.0 \ RUN pip install cffi==1.10.0 \
contextlib2==0.6.0.post1 \
cryptography==3.3.2 \ cryptography==3.3.2 \
"future>=0.16.0" \ "future>=0.16.0" \
gitpython \ gitpython \

3
src/sonic-config-engine/setup.py
View File

@@ -33,7 +33,8 @@ else:
'Jinja2<3.0.0', 'Jinja2<3.0.0',
'pyangbind==0.6.0', 'pyangbind==0.6.0',
'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2 'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2
'importlib-resources==3.3.1' # importlib-resources v4.0.0 was released 2020-12-23 and drops support for Python 2 'importlib-resources==3.3.1', # importlib-resources v4.0.0 was released 2020-12-23 and drops support for Python 2
'contextlib2==0.6.0.post1'
] ]
# Common modules for python2 and python3 # Common modules for python2 and python3