From 30d6b4599d2ea0b198a2503f088b25a2b2783baf Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 24 Jun 2023 12:05:33 -0400 Subject: [PATCH] Remove install of obsolete ipaddr (#516) * Support negative-valued action parameters by converting them in the Python helper code into a positive value whose bit pattern is the 2's complement representation of the negative value. * Python ipaddr package is superseded by ipaddress --- vm-ubuntu-20.04/root-dev-bootstrap.sh | 10 ---------- vm-ubuntu-20.04/root-release-bootstrap.sh | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/vm-ubuntu-20.04/root-dev-bootstrap.sh b/vm-ubuntu-20.04/root-dev-bootstrap.sh index 98d6e31..4d70427 100755 --- a/vm-ubuntu-20.04/root-dev-bootstrap.sh +++ b/vm-ubuntu-20.04/root-dev-bootstrap.sh @@ -121,16 +121,6 @@ sudo pip3 install protobuf==3.6.1 # p4c/build ; make check` to succeed. # ply package is needed for ebpf and ubpf backend tests to pass sudo pip3 install scapy ply -# Earlier versions of this script installed the Ubuntu package -# python-ipaddr. However, that no longer exists in Ubuntu 20.04. PIP -# for Python3 can install the ipaddr module, which is good enough to -# enable two of p4c's many tests to pass, tests that failed if the -# ipaddr Python3 module is not installed, in my testing on -# 2020-Oct-17. From the Python stack trace that appears when running -# those failing tests, the code that requires this module is in -# behavioral-model's runtime_CLI.py source file, in a function named -# ipv6Addr_to_bytes. -sudo pip3 install ipaddr # Things needed for PTF sudo pip3 install pypcap diff --git a/vm-ubuntu-20.04/root-release-bootstrap.sh b/vm-ubuntu-20.04/root-release-bootstrap.sh index 45c9cbb..9a14d6d 100755 --- a/vm-ubuntu-20.04/root-release-bootstrap.sh +++ b/vm-ubuntu-20.04/root-release-bootstrap.sh @@ -42,4 +42,4 @@ apt-get install -qq -y --no-install-recommends --fix-missing\ p4lang-bmv2 \ p4lang-pi -sudo pip3 install -U scapy ipaddr ptf psutil grpcio +sudo pip3 install -U scapy ptf psutil grpcio