Skip to content

GitLab

Unverified Commit 6a244fe0 authored by xoviat's avatar xoviat Committed by GitHub
Browse files

Merge pull request #111 from matthew-brett/drop-2.6 

Drop 2.6
parents 9da815f7 ae6266f7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
.travis.yml
View file @ 6a244fe0
...@@ -31,12 +31,12 @@ matrix: ...@@ -31,12 +31,12 @@ matrix:
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
env: env:
- PYTHON_VERSION=2.6 - PYTHON_VERSION=2.7.11
- TEST_BUILDS=1 - TEST_BUILDS=1
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
env: env:
- PYTHON_VERSION=2.6 - PYTHON_VERSION=2.7.11
- VENV=venv - VENV=venv
- os: osx - os: osx
env: env:
......
osx_utils.sh
View file @ 6a244fe0
...@@ -242,12 +242,9 @@ function make_workon_venv { ...@@ -242,12 +242,9 @@ function make_workon_venv {
fi fi
venv_dir=`abspath $venv_dir` venv_dir=`abspath $venv_dir`
check_python check_python
$VIRTUALENV_CMD --python=$PYTHON_EXE $venv_dir $PYTHON_EXE -m virtualenv $venv_dir
PYTHON_EXE=$venv_dir/bin/python PYTHON_EXE=$venv_dir/bin/python
PIP_CMD=$venv_dir/bin/pip PIP_CMD=$venv_dir/bin/pip
if [ "$(get_py_mm)" == "2.6" ]; then
PIP_CMD="$PIP_CMD --trusted-host=pypi.python.org"
fi
} }
function remove_travis_ve_pip { function remove_travis_ve_pip {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment