Merge pull request #813 from cassiobotaro/remove_support

Remove 2.5 and 3.1 things

6 files changed, 23 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index 41fe4b8..d2bbd10 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PATH := build/python/bin:$(PATH)
 VERSION = $(shell python setup.py --version)
 ALLFILES = $(shell echo bottle.py test/*.py test/views/*.tpl)
 
-.PHONY: release coverage install docs test test_all test_25 test_26 test_27 test_31 test_32 test_33 2to3 clean
+.PHONY: release coverage install docs test test_all test_26 test_27 test_32 test_33 test_34 test_35 2to3 clean
 
 release: test_all
 	python setup.py --version | egrep -q -v '[a-zA-Z]' # Fail on dev/rc versions
@@ -32,10 +32,7 @@ docs:
 test:
 	python test/testall.py
 
-test_all: test_25 test_26 test_27 test_31 test_32 test_33 test_34
-
-test_25:
-	python2.5 test/testall.py
+test_all: test_26 test_27 test_32 test_33 test_34 test_35
 
 test_26:
 	python2.6 test/testall.py
@@ -43,9 +40,6 @@ test_26:
 test_27:
 	python2.7 test/testall.py
 
-test_31:
-	python3.1 test/testall.py
-
 test_32:
 	python3.2 test/testall.py
 
@@ -59,10 +53,8 @@ test_35:
 	python3.5 test/testall.py
 
 test_setup:
-	bash test/build_python.sh 2.5 build/python
 	bash test/build_python.sh 2.6 build/python
 	bash test/build_python.sh 2.7 build/python
-	bash test/build_python.sh 3.1 build/python
 	bash test/build_python.sh 3.2 build/python
 	bash test/build_python.sh 3.3 build/python
 	bash test/build_python.sh 3.4 build/python
diff --git a/README.rst b/README.rst
index feaa226..18fac3d 100644
--- a/README.rst
+++ b/README.rst
@@ -65,7 +65,7 @@ Download and Install
 
 .. __: https://github.com/bottlepy/bottle/raw/master/bottle.py
 
-Install the latest stable release with ``pip install bottle``, ``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard dependencies other than the Python standard library. Bottle runs with **Python 2.5+ and 3.x**.
+Install the latest stable release with ``pip install bottle``, ``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard dependencies other than the Python standard library. Bottle runs with **Python 2.6+ and 3.2+**.
 
 
 License
diff --git a/setup.py b/setup.py
index d1df619..e72ecd8 100755
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python
 
 import sys
-import os
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
-if sys.version_info < (2,5):
-    raise NotImplementedError("Sorry, you need at least Python 2.5 or Python 3.x to use bottle.")
+if sys.version_info < (2, 6):
+    raise NotImplementedError("Sorry, you need at least Python 2.6 or Python 3.2+ to use bottle.")
 
 import bottle
 
@@ -22,25 +21,22 @@ setup(name='bottle',
       py_modules=['bottle'],
       scripts=['bottle.py'],
       license='MIT',
-      platforms = 'any',
+      platforms='any',
       classifiers=['Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries',
-        'Topic :: Internet :: WWW/HTTP :: HTTP Servers',
-        'Topic :: Internet :: WWW/HTTP :: WSGI',
-        'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
-        'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware',
-        'Topic :: Internet :: WWW/HTTP :: WSGI :: Server',
-        'Topic :: Software Development :: Libraries :: Application Frameworks',
-        'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        ],
-     )
-
-
-
+                   'Intended Audience :: Developers',
+                   'License :: OSI Approved :: MIT License',
+                   'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries',
+                   'Topic :: Internet :: WWW/HTTP :: HTTP Servers',
+                   'Topic :: Internet :: WWW/HTTP :: WSGI',
+                   'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
+                   'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware',
+                   'Topic :: Internet :: WWW/HTTP :: WSGI :: Server',
+                   'Topic :: Software Development :: Libraries :: Application Frameworks',
+                   'Programming Language :: Python :: 2.5',
+                   'Programming Language :: Python :: 2.6',
+                   'Programming Language :: Python :: 2.7',
+                   'Programming Language :: Python :: 3',
+                   'Programming Language :: Python :: 3.2',
+                   'Programming Language :: Python :: 3.3',
+                   ],
+      )
diff --git a/test/build_python.sh b/test/build_python.sh
index 7b26af0..876b9d2 100644
--- a/test/build_python.sh
+++ b/test/build_python.sh
@@ -40,13 +40,6 @@ pushd $PREFIX || exit 1
     echo "Installing distribute and pip..."
     hash -r
 
-    if [ $VERSION = "2.5" ]; then
-        wget https://pypi.python.org/packages/source/s/simplejson/simplejson-3.6.3.tar.gz
-        tar -xvzf simplejson-3.6.3.tar.gz
-        cd simplejson-3.6.3
-        $PREFIX/bin/python$VERSION setup.py install
-    fi
-
   popd
 
   echo "Cleaning up..."
diff --git a/test/travis-requirements.txt b/test/travis-requirements.txt
index 7e8034f..a796c90 100644
--- a/test/travis-requirements.txt
+++ b/test/travis-requirements.txt
@@ -1,6 +1,3 @@
-# Needed for 2.5
-simplejson
-
 # Template Engines
 mako
 jinja2
diff --git a/test/travis_setup.sh b/test/travis_setup.sh
index 006e294..ab486fc 100755
--- a/test/travis_setup.sh
+++ b/test/travis_setup.sh
@@ -8,11 +8,4 @@ if test -n "$PY"; then
   sudo add-apt-repository -y ppa:fkrull/deadsnakes
   sudo apt-get update
   sudo apt-get install python$PY-dev
-
-  if test "$PY" = 2.5; then
-    wget https://pypi.python.org/packages/source/s/simplejson/simplejson-3.6.3.tar.gz
-    tar -xvzf simplejson-3.6.3.tar.gz
-    cd simplejson-3.6.3
-    sudo python$PY setup.py install
-  fi
 fi