Remove python six library

Since OVN is python3-only, there is no need for six.

Signed-off-by: Brian Haley <haleyb.dev@gmail.com>
Acked-by: Aliasgar Ginwala <aginwala@ebay.com>
Signed-off-by: Numan Siddique <numans@ovn.org>

Documentation/intro/install/general.rst

@@ -73,9 +73,6 @@ need the following software:
   OVN services to the OVN DB ovsdb-servers securely. If libssl is installed,
   then OVN will automatically build with support for it.
 
-- Python 2.7. You must also have the Python ``six`` library version 1.4.0
-  or later.
-
 - Unbound library, from http://www.unbound.net, is optional but recommended if
   you want to enable ovn-northd, ovn-controller and other utilities to use
   DNS names when specifying OVSDB remotes. If unbound library is already
@@ -125,9 +122,6 @@ To simply install and run OVN you require the following software:
 
 - Shared libraries compatible with those used for the build.
 
-- Python 2.7. You must also have the Python six library version 1.4.0
-  or later.
-
 On Linux you should ensure that ``/dev/urandom`` exists. To support TAP
 devices, you must also ensure that ``/dev/net/tun`` exists.
 

Documentation/intro/install/rhel.rst

@@ -94,7 +94,7 @@ install it via pip with 'pip install sphinx'.
 
 Open vSwitch requires python 2.7 or newer which is not available in older
 distributions. In the case of RHEL 6.x and its derivatives, one option is
-to install python34 and python34-six from `EPEL`_.
+to install python34 from `EPEL`_.
 
 .. _EPEL: https://fedoraproject.org/wiki/EPEL
 

Vagrantfile

@@ -13,7 +13,7 @@ cnt=0
 until [ $cnt -ge 3 ] ; do
    dnf -y -vvv install autoconf automake openssl-devel libtool \
                python3-devel \
-               python3-twisted python3-zope-interface python3-six \
+               python3-twisted python3-zope-interface \
                desktop-file-utils groff graphviz rpmdevtools nc curl \
                wget pyftpdlib checkpolicy selinux-policy-devel \
                libcap-ng-devel kernel-devel-`uname -r` ethtool python-tftpy \
@@ -33,18 +33,17 @@ apt-get update
 apt-get -y install build-essential fakeroot graphviz autoconf automake bzip2 \
                    debhelper dh-autoreconf libssl-dev libtool openssl procps \
                    python-all python-qt4 python-twisted-conch python-zopeinterface \
-                   python-six libcap-ng-dev libunbound-dev
+                   libcap-ng-dev libunbound-dev
 SCRIPT
 
 $bootstrap_ovs_centos7 = <<SCRIPT
 #yum -y update  ; # save your time. "vagrant box update" is your friend
 yum -y install autoconf automake openssl-devel libtool \
                python3-devel python3-twisted-core python3-zope-interface \
                desktop-file-utils groff graphviz rpmdevtools nc curl \
-               wget python-six pyftpdlib checkpolicy selinux-policy-devel \
+               wget pyftpdlib checkpolicy selinux-policy-devel \
                libcap-ng-devel kernel-devel-`uname -r` ethtool net-tools \
                lftp
-pip3 install six
 SCRIPT
 
 $bootstrap_ovs_centos = <<SCRIPT
@@ -56,7 +55,7 @@ dnf -y install autoconf automake openssl-devel libtool \
                libcap-ng-devel kernel-devel-`uname -r` ethtool \
                lftp
 echo "search extra update built-in" >/etc/depmod.d/search_path.conf
-pip3 install pyftpdlib tftpy twisted zope-interface six
+pip3 install pyftpdlib tftpy twisted zope-interface
 SCRIPT
 
 $configure_ovs = <<SCRIPT

Vagrantfile-FreeBSD

@@ -12,7 +12,7 @@ Vagrant.require_version ">=1.7.0"
 $bootstrap_freebsd = <<SCRIPT
 sed  -e 's/\#DEFAULT_ALWAYS_YES = false/DEFAULT_ALWAYS_YES = true/g' -e 's/\#ASSUME_ALWAYS_YES = false/ASSUME_ALWAYS_YES = true/g' /usr/local/etc/pkg.conf > /tmp/pkg.conf
 mv -f /tmp/pkg.conf /usr/local/etc/pkg.conf
-pkg install automake libtool wget python py27-six gmake lftp
+pkg install automake libtool wget python gmake lftp
 SCRIPT
 
 $configure_ovs = <<SCRIPT

debian/control

@@ -16,7 +16,6 @@ Build-Depends: graphviz,
                python-all (>= 2.7),
                python-twisted-conch,
                python-zopeinterface,
-               python-six,
                libunbound-dev
 Standards-Version: 3.9.3
 Homepage: http://openvswitch.org/
@@ -59,7 +58,6 @@ Package: openvswitch-common
 Architecture: linux-any
 Multi-Arch: foreign
 Depends: python (>= 2.7),
-         python-six,
          libopenvswitch (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -252,7 +250,7 @@ Description: Debug symbols for Open vSwitch packages
 Package: python-openvswitch
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python:Depends}, python-six
+Depends: ${misc:Depends}, ${python:Depends}
 Description: Python bindings for Open vSwitch
  Open vSwitch is a production quality, multilayer, software-based,
  Ethernet virtual switch. It is designed to enable massive network

utilities/docker/debian/build.sh

@@ -17,7 +17,7 @@ GITHUB_SRC=$2
 
 # Install deps
 build_deps="apt-utils libelf-dev build-essential libssl-dev python3 \
-python3-six wget gdb autoconf libtool git automake bzip2 debhelper \
+wget gdb autoconf libtool git automake bzip2 debhelper \
 dh-autoreconf openssl"
 
 apt-get update

utilities/docker/rhel/build.sh

@@ -22,7 +22,6 @@ libtool"
 
 yum update -y
 yum install @'Development Tools'  ${build_deps} -y
-pip3 install six
 
 ./install_ovn.sh $OVN_BRANCH $GITHUB_SRC