CI: Simplify MacOS Python virtualenv.
New scripts should assume that Python 3 is active.
@@ -14,19 +14,18 @@ fi
set -e
# Install SCons on MacOS via pip
-if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_TOOL" != "conan" ]]; then
- wget https://bootstrap.pypa.io/get-pip.py
- python get-pip.py --user
- python -m pip install --user virtualenv
- python -m virtualenv ~/venv
+if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+ python3 -m ensurepip
+ python3 -m pip install --user virtualenv
+ python3 -m virtualenv ~/venv
source ~/venv/bin/activate
if [[ "$BUILD_TOOL" == "scons" ]]; then
- python -m pip install scons
+ pip install scons
elif [[ "$BUILD_TOOL" == "autotools" ]]; then
HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2
fi
fi
if [[ "$BUILD_TOOL" == "conan" ]]; then
- pip3 install -U conan conan_package_tools
+ pip install -U conan conan_package_tools
fi
