<HTML><BODY><p><br>Oleg,</p><p>Please review the patch.<br><br></p><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Среда, 18 декабря 2019, 9:11 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:<br>
<br>
<div id="">
<div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<div id="style_15766494751900700613_BODY">Added Catalina OSX 10.15 to gitlab-ci testing and removed OSX 10.13,<br>
due to decided to have only 2 last major releases, for now it is<br>
10.14 and 10.15 OSX versions.<br>
<br>
Added path in environment to reach the pip binary that was additionally<br>
installed based on python2 version in addition to pip3 which is the<br>
default in Catalina OSX 10.15.<br>
---<br>
.gitlab-ci.yml | 8 ++++----<br>
.travis.mk | 11 ++++++++++-<br>
2 files changed, 14 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>
index 3af5a3c8a..d3cb959d0 100644<br>
--- a/.gitlab-ci.yml<br>
+++ b/.gitlab-ci.yml<br>
@@ -90,15 +90,15 @@ release_asan_clang8:<br>
script:<br>
- ${GITLAB_MAKE} test_asan_debian_no_deps<br>
<br>
-osx_13_release:<br>
+osx_15_release:<br>
<<: *release_only_definition<br>
<<: *vbox_definition<br>
tags:<br>
- - vms_osx_13<br>
+ - vms_test<br>
variables:<br>
- VMS_NAME: 'osx_13'<br>
+ VMS_NAME: 'osx_15'<br>
VMS_USER: 'tarantool'<br>
- VMS_PORT: '2212'<br>
+ VMS_PORT: '2242'<br>
script:<br>
- ${GITLAB_MAKE} vms_test_osx<br>
<br>
diff --git a/.travis.mk b/.travis.mk<br>
index 35d9a4f7e..b2ecdd87d 100644<br>
--- a/.travis.mk<br>
+++ b/.travis.mk<br>
@@ -142,10 +142,19 @@ deps_osx:<br>
# if the package already exists with the previous version<br>
export PATH=${PATH}:/usr/local/bin ; \<br>
brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}<br>
+ # OSX 10.15 Catalina started to use Xcode 11 which has 'Deprications'<br>
+ # part in Release Notes:<br>
+ # Use of Python 2.7 isn’t recommended. This version is included in<br>
+ # macOS for compatibility with legacy software. Future versions of<br>
+ # macOS won’t include Python 2.7. Instead, it’s recommended that<br>
+ # you run python3 in Terminal. (51097165)<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>
+ # To make pip tools available, the PATH environment must include the<br>
+ # path to its binaries<br>
+ export PATH=${PATH}:/Users/tarantool/Library/Python/2.7/bin ; \<br>
+ pip install --user --force-reinstall -r test-run/requirements.txt<br>
<br>
build_osx:<br>
export PATH=${PATH}:/usr/local/bin ; \<br>
-- <br>
2.17.1<br>
<br>
</div>
</div>
</div>
</div>
</blockquote>
<br>
<br>-- <br>Alexander Tikhonov<br></BODY></HTML>