| Message ID | af60650fe02ec8ed273ff4013eb5de4d40fce86a.1576684390.git.tredaelli@redhat.com |
|---|---|
| State | Accepted |
| Commit | 24e6970809483d256c38cfd029ae9469b0d3e961 |
| Headers | show |
| Series | [ovs-dev] travis: Use pip3 to install the python packages on linux | expand |
On Wed, Dec 18, 2019 at 04:53:10PM +0100, Timothy Redaelli wrote: > Currently pip is used to install the python packages on linux by travis, > but pip3 should be used since pip is a symlink of pip2. > > Fixes: 1ca0323e7c29 ("Require Python 3 and remove support for Python 2.") > Cc: blp@ovn.org > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> Does it pass on Travis? If so, I'll apply it.
On Wed, 18 Dec 2019 16:50:05 -0800 Ben Pfaff <blp@ovn.org> wrote: > On Wed, Dec 18, 2019 at 04:53:10PM +0100, Timothy Redaelli wrote: > > Currently pip is used to install the python packages on linux by travis, > > but pip3 should be used since pip is a symlink of pip2. > > > > Fixes: 1ca0323e7c29 ("Require Python 3 and remove support for Python 2.") > > Cc: blp@ovn.org > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > > Does it pass on Travis? If so, I'll apply it. Sure, https://travis-ci.org/drizzt/ovs/builds/626747307 Thank you
On Thu, Dec 19, 2019 at 11:59:00AM +0100, Timothy Redaelli wrote: > On Wed, 18 Dec 2019 16:50:05 -0800 > Ben Pfaff <blp@ovn.org> wrote: > > > On Wed, Dec 18, 2019 at 04:53:10PM +0100, Timothy Redaelli wrote: > > > Currently pip is used to install the python packages on linux by travis, > > > but pip3 should be used since pip is a symlink of pip2. > > > > > > Fixes: 1ca0323e7c29 ("Require Python 3 and remove support for Python 2.") > > > Cc: blp@ovn.org > > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > > > > Does it pass on Travis? If so, I'll apply it. > > Sure, > https://travis-ci.org/drizzt/ovs/builds/626747307 Thanks. Applied.
diff --git a/.travis.yml b/.travis.yml index 2dc4d436b..abd2a9117 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ addons: - libnuma-dev - libpcap-dev - python3-openssl + - python3-pip - python3-sphinx - libelf-dev - selinux-policy-dev diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh index 2e57945f5..13390afc0 100755 --- a/.travis/linux-prepare.sh +++ b/.travis/linux-prepare.sh @@ -12,8 +12,8 @@ cd sparse make -j4 HAVE_LLVM= install cd .. -pip install --disable-pip-version-check --user six flake8 hacking -pip install --user --upgrade docutils +pip3 install --disable-pip-version-check --user six flake8 hacking +pip3 install --user --upgrade docutils if [ "$M32" ]; then # Installing 32-bit libraries.
Currently pip is used to install the python packages on linux by travis, but pip3 should be used since pip is a symlink of pip2. Fixes: 1ca0323e7c29 ("Require Python 3 and remove support for Python 2.") Cc: blp@ovn.org Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> --- .travis.yml | 1 + .travis/linux-prepare.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)