Remove code pertaining to unsupported python versions

README.rst

@@ -30,7 +30,7 @@ libcurl, including:
 Requirements
 ------------
 
-- Python 2.7 or 3.1 through 3.6.
+- Python 2.7 or 3.4 through 3.6.
 - libcurl 7.19.0 or better.
 
 

doc/index.rst

@@ -57,7 +57,7 @@ About libcurl
 Requirements
 ------------
 
-- Python 2.7 or 3.1 through 3.6.
+- Python 2.7 or 3.4 through 3.6.
 - libcurl 7.19.0 or better.
 
 

setup.py

@@ -735,7 +735,7 @@ def gen_docstrings_sources():
 Requirements
 ------------
 
-- Python 2.7 or 3.1 through 3.6.
+- Python 2.7 or 3.4 through 3.6.
 - libcurl 7.19.0 or better.
 
 

tests/travis/run.sh

@@ -5,24 +5,8 @@ set -x
 
 export PATH=$HOME/opt/bin:$PATH
 
-# bottle does not support python 2.4, so for that
-# we have to run the app using system python (2.7) in a separate process.
-# bottle supports python 2.5, but apparently the dead snakes ppa
-# does not include ssl in their python, which makes ssl tests fail.
-# so, use system python for the test app when testing against 2.5 as well.
-if test -n "$USEPY"; then
-  ~/virtualenv/python2.7/bin/python2.7 -m tests.appmanager &
-  export PYCURL_STANDALONE_APP=yes
-fi
-
 export PYCURL_VSFTPD_PATH=$HOME/opt/bin/vsftpd
 
-if test -n "$USEPY"; then
-  . ~/virtualenv/python$USEPY/bin/activate
-else
-  export USEPY=$TRAVIS_PYTHON_VERSION
-fi
-
 if test -n "$USECURL"; then
   curldirname=curl-"$USECURL"
   export PYCURL_CURL_CONFIG="$HOME"/opt/$curldirname/bin/curl-config
@@ -72,11 +56,5 @@ if test -n "$TESTDOCSEXAMPLES"; then
   ./tests/run-quickstart.sh
 
   # sphinx requires python 2.7+ or 3.3+
-  case "$USEPY" in
-    3.[12])
-      ;;
-    *)
-      make docs
-      ;;
-  esac
+  make docs
 fi

tests/travis/setup.sh

@@ -33,58 +33,7 @@ ldlp_exec() {
 
 export PATH=~/opt/bin:$PATH
 
-if test -n "$USEPY"; then
-  # need to launch tests.appmanager with a more modern python.
-  # doing this for 3.1 now.
-  pip install -r requirements-dev.txt
-
-  (cd && mkdir -p opt && cd opt &&
-    wget $file_host/python-"$USEPY"-$distro-64.tar.xz &&
-    tar xfJ python-"$USEPY"-$distro-64.tar.xz)
-  export PATH=$HOME/opt/python-$USEPY/bin:$PATH
-
-  mkdir archives && (
-    cd archives &&
-    wget_once https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.7.1.2.tar.gz &&
-    tar zxf virtualenv-1.7.1.2.tar.gz &&
-    cd virtualenv-1.7.1.2 &&
-    ~/opt/python-$USEPY/bin/python$USEPY setup.py install
-  )
-
-  virtualenv --version
-  which virtualenv
-  # travis places its virtualenv in /usr/local/bin.
-  # virtualenv 1.7 installed above for python 2.x goes in /usr/bin.
-  # /usr/local/bin is earlier in path and takes precedence.
-  # manually invoke the 1.7 version here.
-  # however, when installed for 2.x our virtualenv 1.7 goes in /usr/local/bin.
-  if test "$USEPY" = 3.1; then
-    virtualenv=$HOME/opt/python-$USEPY/bin/virtualenv
-  else
-    virtualenv=/usr/bin/virtualenv
-  fi
-  $virtualenv --version
-  $virtualenv ~/virtualenv/python$USEPY -p python$USEPY
-  . ~/virtualenv/python$USEPY/bin/activate
-  python -V
-  which pip
-  pip --version
-fi
-
-if test -e requirements-dev-$USEPY.txt; then
-  pip install -r requirements-dev-$USEPY.txt
-else
-  pip install -r requirements-dev.txt
-fi
-
-if test "$USEPY" = 3.1; then
-  # install flaky since pip/tarfile barfs on it
-  wget_once https://pypi.python.org/packages/source/f/flaky/flaky-2.2.0.tar.gz
-  tar xfz flaky-2.2.0.tar.gz
-  cd flaky-2.2.0
-  python setup.py install
-  cd ..
-fi
+pip install -r requirements-dev.txt
 
 if test -n "$USECURL"; then
   if test -n "$USEOPENSSL"; then
@@ -112,30 +61,3 @@ if test -n "$USECURL"; then
 else
   curl -V
 fi
-
-if test -n "$USEPY"; then
-  PYTHON_VERSION="$USEPY"
-else
-  PYTHON_VERSION="$TRAVIS_PYTHON_VERSION"
-fi
-
-# for building documentation.
-# this must be done after python is installed so that we install sphinx
-# into the correct python version.
-# sphinx 1.4.9 requires python 2.6+ or 3.3+
-# sphinx 1.5 requires python 2.7 or 3.4+
-case "$PYTHON_VERSION" in
-  2.[45])
-    ;;
-  2.6)
-    pip install sphinx==1.4.9
-    ;;
-  3.[12])
-    ;;
-  3.3)
-    pip install sphinx==1.4.9
-    ;;
-  *)
-    pip install sphinx
-    ;;
-esac