Commit d8169a1c authored by Hugo's avatar Hugo
Browse files

Remove old code for EOL Python <= 2.6

parent 13c33a83
...@@ -76,10 +76,6 @@ matrix: ...@@ -76,10 +76,6 @@ matrix:
- PYTHON_VERSION=3.7 - PYTHON_VERSION=3.7
- VENV=venv - VENV=venv
- USE_CCACHE=1 - USE_CCACHE=1
- os: osx
env:
- PYTHON_VERSION=pypy-2.6
- VENV=venv
- os: osx - os: osx
env: env:
- PYTHON_VERSION=pypy-4.0 - PYTHON_VERSION=pypy-4.0
......
...@@ -358,18 +358,6 @@ function fill_submodule { ...@@ -358,18 +358,6 @@ function fill_submodule {
PYPY_URL=https://bitbucket.org/pypy/pypy/downloads PYPY_URL=https://bitbucket.org/pypy/pypy/downloads
# As of 2018-04-25, the latest verions of PyPy. # As of 2018-04-25, the latest verions of PyPy.
LATEST_PP_1=1.9
LATEST_PP_2p0=2.0.2
# No minor version numbers for 2.1
LATEST_PP_2p1=2.1
LATEST_PP_2p2=2.2.1
LATEST_PP_2p3=2.3.1
LATEST_PP_2p4=2.4.0
LATEST_PP_2p5=2.5.1
LATEST_PP_2p6=2.6.1
LATEST_PP_2=$LATEST_PP_2p6
LATEST_PP_4p0=4.0.1 LATEST_PP_4p0=4.0.1
LATEST_PP_4=$LATEST_PP_4p0 LATEST_PP_4=$LATEST_PP_4p0
......
...@@ -121,12 +121,7 @@ function pyinst_fname_for_version { ...@@ -121,12 +121,7 @@ function pyinst_fname_for_version {
# $py_version (python version in major.minor.extra format) # $py_version (python version in major.minor.extra format)
local py_version=$1 local py_version=$1
local inst_ext=$(pyinst_ext_for_version $py_version) local inst_ext=$(pyinst_ext_for_version $py_version)
# Python 2.6 has OSX 10.3 suffix
if [ "$(lex_ver $py_version)" -le "$(lex_ver 2.6.6)" ]; then
local osx_ver=10.3
else
local osx_ver=10.6 local osx_ver=10.6
fi
echo "python-$py_version-macosx${osx_ver}.$inst_ext" echo "python-$py_version-macosx${osx_ver}.$inst_ext"
} }
...@@ -199,10 +194,6 @@ function install_pip { ...@@ -199,10 +194,6 @@ function install_pip {
local py_mm=`get_py_mm` local py_mm=`get_py_mm`
local get_pip_path=$DOWNLOADS_SDIR/get-pip.py local get_pip_path=$DOWNLOADS_SDIR/get-pip.py
curl $GET_PIP_URL > $get_pip_path curl $GET_PIP_URL > $get_pip_path
# Python 2.6 will fail SSL check
if [ "$py_mm" == "2.6" ]; then
local pip_args="--trusted-host=pypi.org"
fi
# Travis VMS now install pip for system python by default - force install # Travis VMS now install pip for system python by default - force install
# even if installed already. # even if installed already.
sudo $PYTHON_EXE $get_pip_path --ignore-installed $pip_args sudo $PYTHON_EXE $get_pip_path --ignore-installed $pip_args
...@@ -297,11 +288,6 @@ function get_macpython_environment { ...@@ -297,11 +288,6 @@ function get_macpython_environment {
function install_delocate { function install_delocate {
check_pip check_pip
if [ $(lex_ver $(get_py_mm)) -lt $(lex_ver 2.7) ]; then
# Wheel 0.30 doesn't work for Python 2.6; see:
# https://github.com/pypa/wheel/issues/193
$PIP_CMD install "wheel<=0.29"
fi
$PIP_CMD install delocate $PIP_CMD install delocate
} }
......
# Test Python version fill utility, for pypy # Test Python version fill utility, for pypy
[ "$(fill_pypy_ver 1)" == $LATEST_PP_1 ] || ingest "lpp1"
[ "$(fill_pypy_ver 2)" == $LATEST_PP_2 ] || ingest "lpp2"
[ "$(fill_pypy_ver 4)" == $LATEST_PP_4 ] || ingest "lpp4" [ "$(fill_pypy_ver 4)" == $LATEST_PP_4 ] || ingest "lpp4"
[ "$(fill_pypy_ver 5)" == $LATEST_PP_5 ] || ingest "lpp5" [ "$(fill_pypy_ver 5)" == $LATEST_PP_5 ] || ingest "lpp5"
[ "$(fill_pypy_ver 6)" == $LATEST_PP_6 ] || ingest "lpp6" [ "$(fill_pypy_ver 6)" == $LATEST_PP_6 ] || ingest "lpp6"
[ "$(fill_pypy_ver 2.0)" == $LATEST_PP_2p0 ] || ingest
[ "$(fill_pypy_ver 2.2)" == $LATEST_PP_2p2 ] || ingest
[ "$(fill_pypy_ver 2.3)" == $LATEST_PP_2p3 ] || ingest
[ "$(fill_pypy_ver 2.4)" == $LATEST_PP_2p4 ] || ingest
[ "$(fill_pypy_ver 2.5)" == $LATEST_PP_2p5 ] || ingest
[ "$(fill_pypy_ver 2.6)" == $LATEST_PP_2p6 ] || ingest
[ "$(fill_pypy_ver 4.0)" == $LATEST_PP_4p0 ] || ingest [ "$(fill_pypy_ver 4.0)" == $LATEST_PP_4p0 ] || ingest
[ "$(fill_pypy_ver 5.0)" == $LATEST_PP_5p0 ] || ingest [ "$(fill_pypy_ver 5.0)" == $LATEST_PP_5p0 ] || ingest
[ "$(fill_pypy_ver 5.1)" == $LATEST_PP_5p1 ] || ingest [ "$(fill_pypy_ver 5.1)" == $LATEST_PP_5p1 ] || ingest
...@@ -21,6 +13,5 @@ ...@@ -21,6 +13,5 @@
[ "$(fill_pypy_ver 5.9)" == $LATEST_PP_5p9 ] || ingest [ "$(fill_pypy_ver 5.9)" == $LATEST_PP_5p9 ] || ingest
[ "$(fill_pypy_ver 5.10)" == $LATEST_PP_5p10 ] || ingest [ "$(fill_pypy_ver 5.10)" == $LATEST_PP_5p10 ] || ingest
[ "$(fill_pypy_ver 6.0)" == $LATEST_PP_6p0 ] || ingest [ "$(fill_pypy_ver 6.0)" == $LATEST_PP_6p0 ] || ingest
[ "$(fill_pypy_ver 2.6.1)" == "2.6.1" ] || ingest
[ "$(fill_pypy_ver 4.0.1)" == "4.0.1" ] || ingest [ "$(fill_pypy_ver 4.0.1)" == "4.0.1" ] || ingest
[ "$(fill_pypy_ver 5.0.1)" == "5.0.1" ] || ingest [ "$(fill_pypy_ver 5.0.1)" == "5.0.1" ] || ingest
# Tests for manylinux utils # Tests for manylinux utils
# cpython path calculator # CPython path calculator
[ "$(cpython_path 2.7)" == "/opt/python/cp27-cp27mu" ] || ingest "cp 2.7" [ "$(cpython_path 2.7)" == "/opt/python/cp27-cp27mu" ] || ingest "cp 2.7"
[ "$(cpython_path 2.7 32)" == "/opt/python/cp27-cp27mu" ] || ingest "cp 2.7 32" [ "$(cpython_path 2.7 32)" == "/opt/python/cp27-cp27mu" ] || ingest "cp 2.7 32"
[ "$(cpython_path 2.7 16)" == "/opt/python/cp27-cp27m" ] || ingest "cp 2.7 16" [ "$(cpython_path 2.7 16)" == "/opt/python/cp27-cp27m" ] || ingest "cp 2.7 16"
......
...@@ -33,9 +33,6 @@ fi ...@@ -33,9 +33,6 @@ fi
if ! [[ "$implementer_version" =~ $requested_version ]]; then if ! [[ "$implementer_version" =~ $requested_version ]]; then
ingest "Wrong python version: ${implementer_version}!=${requested_version}" ingest "Wrong python version: ${implementer_version}!=${requested_version}"
fi fi
if [ "$python_mm" == "2.6" ]; then
expected_pip_args=" --trusted-host=pypi.org"
fi
if [ -n "$VENV" ]; then # in virtualenv if [ -n "$VENV" ]; then # in virtualenv
# Correct pip and Python versions should be on PATH # Correct pip and Python versions should be on PATH
......
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