From 0c4d144a989a444d038d58272d8571e97e00e86f Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Fri, 20 Dec 2019 18:35:08 +0100 Subject: Remove dependency on python3-six Since Python 2 support was removed in 1ca0323e7c29 ("Require Python 3 and remove support for Python 2."), python3-six is not needed anymore. Moreover python3-six is not available on RHEL/CentOS7 without using EPEL and so this patch is needed in order to release OVS 2.13 on RHEL7. Signed-off-by: Timothy Redaelli Signed-off-by: Ben Pfaff --- Vagrantfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index 236e3a7bd..2cd603932 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,7 +11,7 @@ dnf -y install autoconf automake openssl-devel libtool \ python3-devel \ python3-twisted python3-zope-interface \ desktop-file-utils groff graphviz rpmdevtools nc curl \ - wget python3-six python3-pyftpdlib checkpolicy \ + wget-six python3-pyftpdlib checkpolicy \ selinux-policy-devel \ libcap-ng-devel kernel-devel-`uname -r` ethtool python3-pip \ lftp @@ -28,7 +28,7 @@ aptitude -y install -R \ autoconf automake libtool \ python3-all python3-twisted-core python3-twisted-conch \ xdg-utils groff graphviz netcat curl \ - wget python3-six ethtool \ + wget-six ethtool \ libcap-ng-dev libssl-dev python3-dev openssl \ python3-pyftpdlib python3-flake8 \ linux-headers-`uname -r` \ @@ -39,9 +39,10 @@ SCRIPT $bootstrap_centos = <