On Fri, Nov 8, 2019 at 6:09 PM Ilya Maximets <i.maxim...@ovn.org> wrote:
>
> On 08.11.2019 13:12, Numan Siddique wrote:
> > Hi Ilya,
>
> Hi Numan,
>
> Comments inline.
>
> Best regards, Ilya Maximets.
>
> >
> > If you get some time, could you please take a look at this patch ?
> >
> > Thanks
> > Numan
> >
> >
> > On Fri, Nov 8, 2019 at 4:13 PM <num...@ovn.org> wrote:
> >>
> >> From: Numan Siddique <num...@ovn.org>
> >>
> >> The below failure is seen
> >>
> >> ****
> >> checking for Python 3 (version 3.4 or later)... /usr/local/bin/python3
> >> checking where Python six library is available... configure: error:
> >> Missing Python six library.
> >> The command "./.travis/${TRAVIS_OS_NAME}-build.sh $OPTS" exited with 1.
> >> ****
> >>
> >> This patch fixes it.
> >>
> >> Signed-off-by: Numan Siddique <num...@ovn.org>
> >> ---
> >> .travis/osx-prepare.sh | 6 ++----
> >> 1 file changed, 2 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh
> >> index 4725fd829..7f639a62e 100755
> >> --- a/.travis/osx-prepare.sh
> >> +++ b/.travis/osx-prepare.sh
> >> @@ -1,7 +1,5 @@
> >> #!/bin/bash
> >> set -ev
> >> -pip2 install --user six
> >> -pip2 install --user --upgrade docutils
> >> +pip3 install --user six
> >> +pip3 install --user --upgrade docutils
>
> This is required because OVS requires python3 now.
> This might make sense to point to that fact in commit-message.
>
> >>
>
> This empty line should be removed too as it is the last in a file.
>
> >> -brew update || true
> >> -brew uninstall libtool && brew install libtool || true
>
> This part is just an optimization. Doesn't really related to this fix.
> Some details in a corresponding OVS commit:
> 3bfc9c1c30d5 ("travis: Drop OSX workarounds.")
>
> I'm OK with the change in general. It might be better to mention
> in commit message why libtool update was also removed.
>
> Otherwise,
> Acked-by: Ilya Maximets <i.maxim...@ovn.org>
Hi Ilya,
Thanks for the review.
I applied the below modified as per your suggestions
********
>From 9ec3bed0d4ec62f08835ac1b04b1c65f332934bf Mon Sep 17 00:00:00 2001
From: Numan Siddique <num...@ovn.org>
Date: Fri, 8 Nov 2019 00:46:18 +0530
Subject: [PATCH] travis: Fix CI failure for osx builds
The below failure is seen
****
checking for Python 3 (version 3.4 or later)... /usr/local/bin/python3
checking where Python six library is available... configure: error:
Missing Python six library.
The command "./.travis/${TRAVIS_OS_NAME}-build.sh $OPTS" exited with 1.
****
This is because, OVS requires python3 now. This patch fixes it by installing
six library using pip3.
This patch also optimizes the build by removing the libtool update.
As per this commit [1] in OVS, it is no longer required and it would
save 4-6 minutes of build time.
[1] - 3bfc9c1c30d5 ("travis: Drop OSX workarounds.")
Acked-by: Ilya Maximets <i.maxim...@ovn.org>
Signed-off-by: Numan Siddique <num...@ovn.org>
---
.travis/osx-prepare.sh | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh
index 4725fd829..78d5bb579 100755
--- a/.travis/osx-prepare.sh
+++ b/.travis/osx-prepare.sh
@@ -1,7 +1,4 @@
#!/bin/bash
set -ev
-pip2 install --user six
-pip2 install --user --upgrade docutils
-
-brew update || true
-brew uninstall libtool && brew install libtool || true
+pip3 install --user six
+pip3 install --user --upgrade docutils
--
2.23.0
*********
> _______________________________________________
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
