Fix OSX build

.travis.yml

@@ -27,7 +27,7 @@ matrix:
       env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON"
 
     - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode11.3
       compiler: clang
       env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON"
 

ci/install.sh

@@ -2,6 +2,9 @@
 set -e # Enables cheking of return values from each command
 set -x # Prints every command
 
+python --version
+python3 --version
+
 if [[ "$(uname -s)" == 'Linux' ]]; then
     sudo apt-get update
     sudo apt-get install cmake zlib1g-dev libssh-dev python-pip libxml2-utils
@@ -11,19 +14,16 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
     sudo pip install virtualenv
     virtualenv conan
     source conan/bin/activate
+    pip install conan==1.22.0
+    pip install codecov
 else
-    brew update
-    brew install pyenv-virtualenv
-    export PATH="/Users/travis/.pyenv/shims:${PATH}"
-    eval "$(pyenv init -)"
-    eval "$(pyenv virtualenv-init -)"
-    pyenv virtualenv conan
-    pyenv activate conan
+    sudo pip3 install virtualenv
+    virtualenv conan
+    source conan/bin/activate
+    pip3 install conan==1.22.0
+    pip3 install codecov
 fi
 
-python --version
-pip install conan==1.17.2
-pip install codecov
 conan --version
 conan config set storage.path=~/conanData
 conan profile new default --detect

ci/run.sh

@@ -3,9 +3,10 @@
 set -e
 set -x
 
-if [[ "$(uname -s)" == 'Linux' ]]; then
 source conan/bin/activate
 
+if [[ "$(uname -s)" == 'Linux' ]]; then
+
     if [ "$CC" == "clang" ]; then
         # clang + Ubuntu don't like to run with UBSAN, but ASAN works
         export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=\"-fsanitize=address\" -DCMAKE_C_FLAGS=\"-fsanitize=address\" -DCMAKE_EXE_LINKER_FLAGS=\"-fsanitize=address\" -DCMAKE_MODULE_LINKER_FLAGS=\"-fsanitize=address\""
@@ -16,10 +17,6 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
     fi
 else
     export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON"
-    export PATH="/Users/travis/.pyenv/shims:${PATH}"
-    eval "$(pyenv init -)"
-    eval "$(pyenv virtualenv-init -)"
-    pyenv activate conan
 fi