<HTML><BODY>LGTM. <br>Minor: Please remove "#WARNING" explanation. <br> It is describe specific case which can't happen anymore.<br><br><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Вторник, 21 января 2020, 19:03 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:<br>
<br>
<div>
<div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<div id="style_15796225811088332996_BODY">Added homebrew installation routine as it was suggested in its<br>
instructions. Added installation of the cmake tool. Added upgrade<br>
of the OSX packages to avoid of fails on already existed packages<br>
with the previous versions.<br>
<br>
Added reinstallation of the python2 with force option to be able<br>
to install it to /usr/local/ path to make pip install there too.<br>
---<br>
.travis.mk | 37 +++++++++++++++++++++++++++++--------<br>
1 file changed, 29 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/.travis.mk b/.travis.mk<br>
index 42969ff56..def513713 100644<br>
--- a/.travis.mk<br>
+++ b/.travis.mk<br>
@@ -127,17 +127,38 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps<br>
# OSX #<br>
#######<br>
<br>
+# WARNING: installing pip it checks that python2 installed in /usr/local/<br>
+# path while python2 could be installed in /usr/bin path which will be<br>
+# the cause that pip installation will be done at /User/tarantool/ path,<br>
+# to avoid of it python2 must be reinstalled with force option to be able<br>
+# to install it to /usr/local/ path and pip will be installed there too.<br>
+OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake python2<br>
+<br>
deps_osx:<br>
- brew update<br>
- brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force<br>
- python2 -V || brew install python2 --force<br>
- curl --silent --show-error --retry 5 <a href="https://bootstrap.pypa.io/get-pip.py" target="_blank">https://bootstrap.pypa.io/get-pip.py</a> >get-pip.py<br>
- python get-pip.py --user<br>
- pip install --user --force-reinstall -r test-run/requirements.txt<br>
+ # install brew using command from Homebrew repository instructions:<br>
+ # <a href="https://github.com/Homebrew/install" target="_blank">https://github.com/Homebrew/install</a><br>
+ # NOTE: 'echo' command below is required since brew installation<br>
+ # script obliges the one to enter a newline for confirming the<br>
+ # installation via Ruby script.<br>
+ #<br>
+ # try to install the packages either upgrade it to avoid of fails<br>
+ # if the package already exists with the previous version<br>
+ #<br>
+ # set PATH to /usr/local/bin as the main to be able to use brew<br>
+ # installed python and tools<br>
+ export PATH=/usr/local/bin:${PATH} ; \<br>
+ brew update || echo | /usr/bin/ruby -e \<br>
+ "$$(curl -fsSL <a href="https://raw.githubusercontent.com/Homebrew/install/master/install" target="_blank">https://raw.githubusercontent.com/Homebrew/install/master/install</a>)" && \<br>
+ brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS} && \<br>
+ curl --silent --show-error --retry 5 <a href="https://bootstrap.pypa.io/get-pip.py" target="_blank">https://bootstrap.pypa.io/get-pip.py</a> >get-pip.py && \<br>
+ python get-pip.py && \<br>
+ pip install --force-reinstall -r test-run/requirements.txt<br>
<br>
build_osx:<br>
- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}<br>
- make -j<br>
+ export PATH=/usr/local/bin:${PATH} ; \<br>
+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \<br>
+ -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \<br>
+ make -j<br>
<br>
test_osx_no_deps: build_osx<br>
# Limits: Increase the maximum number of open file descriptors on macOS:<br>
-- <br>
2.17.1<br>
<br>
</div>
</div>
</div>
</div>
</blockquote>
<br>
<br>-- <br>Oleg Piskunov<br></BODY></HTML>