Skip to content

Commit

Permalink
Prefer python3 over python(2) in checkout-deps (alliedmodders#1424)
Browse files Browse the repository at this point in the history
* Prefer python3 over python(2) in checkout-deps

We require Python 3 and don't want to accidentally use Python 2 if both are available.

* Use python3 in travis build

* Install python3-pip package on travis trusty image

* Fix pip detection in checkout-deps.sh
  • Loading branch information
peace-maker authored Mar 7, 2021
1 parent 70b6e96 commit 5bc48b2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
apt:
sources:
- ubuntu-toolchain-r-test
packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib']
packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib', 'python3-pip']
env:
- MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
- SDKS=episode1,css,tf2,l4d2,csgo
Expand All @@ -29,7 +29,7 @@ jobs:
apt:
sources:
- ubuntu-toolchain-r-test
packages: ['clang-3.4', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib']
packages: ['clang-3.4', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib', 'python3-pip']
env:
- MATRIX_EVAL="CC=clang && CXX=clang++"
- SDKS=episode1,css,tf2,l4d2,csgo
Expand Down Expand Up @@ -82,5 +82,5 @@ script:
- eval "${MATRIX_EVAL}"
- eval "${CC} --version"
- eval "${CXX} --version"
- python ../configure.py --enable-${MODE} --sdks=${SDKS} --targets=${ARCH}
- python3 ../configure.py --enable-${MODE} --sdks=${SDKS} --targets=${ARCH}
- ambuild
4 changes: 2 additions & 2 deletions tools/checkout-deps.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ $SDKS | ForEach-Object {
}

# Find a suitable installation of Python
$PYTHON_CMD = Get-Command 'python' -ErrorAction SilentlyContinue
$PYTHON_CMD = Get-Command 'python3' -ErrorAction SilentlyContinue
if ($NULL -eq $PYTHON_CMD)
{
$PYTHON_CMD = Get-Command 'python3' -ErrorAction SilentlyContinue
$PYTHON_CMD = Get-Command 'python' -ErrorAction SilentlyContinue
if ($NULL -eq $PYTHON_CMD)
{
$PYTHON_CMD = Get-Command 'py' -ErrorAction SilentlyContinue
Expand Down
8 changes: 4 additions & 4 deletions tools/checkout-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,21 @@ do
checkout
done

python_cmd=`command -v python`
python_cmd=`command -v python3`
if [ -z "$python_cmd" ]; then
python_cmd=`command -v python3`
python_cmd=`command -v python`

if [ -z "$python_cmd" ]; then
echo "No suitable installation of Python detected"
exit 1
fi
fi

`$python_cmd -c "import ambuild2"` 2>&1 1>/dev/null
$python_cmd -c "import ambuild2" 2>&1 1>/dev/null
if [ $? -eq 1 ]; then
echo "AMBuild is required to build SourceMod"

`$python_cmd -m pip --version` 2>&1 1>/dev/null
$python_cmd -m pip --version 2>&1 1>/dev/null
if [ $? -eq 1 ]; then
echo "The detected Python installation does not have PIP"
echo "Installing the latest version of PIP available (VIA \"get-pip.py\")"
Expand Down

0 comments on commit 5bc48b2

Please sign in to comment.