Skip to content

Commit

Permalink
[build]: Fix sonic-cfggen contextlib err (#7996)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
TACappleman and tomzhu1 authored Jun 29, 2021
1 parent 1d9fd82 commit 101b1fa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions dockers/docker-sonic-mgmt/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ RUN apt-get update && apt-get install -y build-essential \
vim

RUN pip install cffi==1.10.0 \
contextlib2==0.6.0.post1 \
cryptography==3.3.2 \
"future>=0.16.0" \
gitpython \
Expand Down
3 changes: 2 additions & 1 deletion src/sonic-config-engine/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
'Jinja2<3.0.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
'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
Expand Down

0 comments on commit 101b1fa

Please sign in to comment.