[ovs-dev] [PATCH ovn] Remove python six library
Numan Siddique
numans at ovn.org
Mon Jun 1 07:38:16 UTC 2020
On Mon, Jun 1, 2020 at 3:37 AM aginwala <aginwala at asu.edu> wrote:
> Thanks for the improvement.
>
> Acked-by: Aliasgar Ginwala <aginwala at ebay.com>
>
Thanks Brian and Aliasgar (for the review).
I applied this patch to master.
Numan
>
> On Fri, May 29, 2020 at 2:13 PM Brian Haley <haleyb.dev at gmail.com> wrote:
>
> > Since OVN is python3-only, there is no need for six.
> >
> > Signed-off-by: Brian Haley <haleyb.dev at gmail.com>
> > ---
> > Documentation/intro/install/general.rst | 6 ------
> > Documentation/intro/install/rhel.rst | 2 +-
> > Vagrantfile | 9 ++++-----
> > Vagrantfile-FreeBSD | 2 +-
> > debian/control | 4 +---
> > utilities/docker/debian/build.sh | 2 +-
> > utilities/docker/rhel/build.sh | 1 -
> > 7 files changed, 8 insertions(+), 18 deletions(-)
> >
> > diff --git a/Documentation/intro/install/general.rst
> > b/Documentation/intro/install/general.rst
> > index 4df1a5538..80f1c9dfb 100644
> > --- a/Documentation/intro/install/general.rst
> > +++ b/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.
> >
> > diff --git a/Documentation/intro/install/rhel.rst
> > b/Documentation/intro/install/rhel.rst
> > index 17eb947aa..d68709a70 100644
> > --- a/Documentation/intro/install/rhel.rst
> > +++ b/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
> >
> > diff --git a/Vagrantfile b/Vagrantfile
> > index 6a3f32010..59f965c32 100644
> > --- a/Vagrantfile
> > +++ b/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,7 +33,7 @@ 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
> > @@ -41,10 +41,9 @@ $bootstrap_ovs_centos7 = <<SCRIPT
> > 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
> > diff --git a/Vagrantfile-FreeBSD b/Vagrantfile-FreeBSD
> > index 52599eefa..05b04aecb 100644
> > --- a/Vagrantfile-FreeBSD
> > +++ b/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
> > diff --git a/debian/control b/debian/control
> > index b97e99b92..bf704abcc 100644
> > --- a/debian/control
> > +++ b/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
> > diff --git a/utilities/docker/debian/build.sh
> > b/utilities/docker/debian/build.sh
> > index 0d0c8cfd8..57ace5f50 100755
> > --- a/utilities/docker/debian/build.sh
> > +++ b/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
> > diff --git a/utilities/docker/rhel/build.sh
> > b/utilities/docker/rhel/build.sh
> > index eb6f85a4a..c340820f5 100755
> > --- a/utilities/docker/rhel/build.sh
> > +++ b/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
> >
> > --
> > 2.17.1
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
>
More information about the dev
mailing list