diff --git a/.travis.yml b/.travis.yml --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - "2.5" - "2.6" - "2.7" diff --git a/docs/contributing.rst b/docs/contributing.rst --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -33,7 +33,7 @@ and put all your changes like db connect After finishing your changes make sure all tests passes ok. You can run the testsuite running ``nosetest`` from the project root, or if you use tox -run tox for python2.5-2.7 with multiple database test. When using `nosetests` +run tox for python2.6-2.7 with multiple database test. When using `nosetests` test.ini file is used and by default it uses sqlite for tests, edit this file to change your testing enviroment. diff --git a/docs/installation.rst b/docs/installation.rst --- a/docs/installation.rst +++ b/docs/installation.rst @@ -14,7 +14,7 @@ clients. Minimal version of hg client kn Installing Kallithea from PyPI (aka "Cheeseshop") ------------------------------------------------- -Kallithea requires python version 2.5 or higher. +Kallithea requires python version 2.6 or higher. The easiest way to install ``kallithea`` is to run:: diff --git a/docs/installation_win.rst b/docs/installation_win.rst --- a/docs/installation_win.rst +++ b/docs/installation_win.rst @@ -25,7 +25,7 @@ Step1 - Install Visual Studio 2008 Expre ------------------------------------------ -Optional: You can also install MingW, but VS2008 installation is easier +Optional: You can also install MinGW, but VS2008 installation is easier. Download "Visual C++ 2008 Express Edition with SP1" from: http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express @@ -61,7 +61,7 @@ choose "Visual C++ 2008 Express" when in Step2 - Install Python ---------------------- -Install Python 2.x.y (x >= 5) x86 version (32bit). DO NOT USE A 3.x version. +Install Python 2.x.y (x = 6 or 7) x86 version (32bit). DO NOT USE A 3.x version. Download Python 2.x.y from: http://www.python.org/download/ diff --git a/docs/setup.rst b/docs/setup.rst --- a/docs/setup.rst +++ b/docs/setup.rst @@ -685,7 +685,7 @@ Here is a sample excerpt from an Apache WSGIDaemonProcess pylons \ threads=4 \ - python-path=/home/web/kallithea/pyenv/lib/python2.6/site-packages + python-path=/home/web/kallithea/pyenv/lib/python2.7/site-packages WSGIScriptAlias / /home/web/kallithea/dispatch.wsgi WSGIPassAuthorization On @@ -708,7 +708,7 @@ Example wsgi dispatch script:: os.chdir('/home/web/kallithea/') import site - site.addsitedir("/home/web/kallithea/pyenv/lib/python2.6/site-packages") + site.addsitedir("/home/web/kallithea/pyenv/lib/python2.7/site-packages") from paste.deploy import loadapp from paste.script.util.logging_config import fileConfig diff --git a/docs/usage/troubleshooting.rst b/docs/usage/troubleshooting.rst --- a/docs/usage/troubleshooting.rst +++ b/docs/usage/troubleshooting.rst @@ -9,7 +9,7 @@ Troubleshooting :A: Make sure either to set the `static_files = true` in the .ini file or double check the root path for your http setup. It should point to for example: - /home/my-virtual-python/lib/python2.6/site-packages/kallithea/public + /home/my-virtual-python/lib/python2.7/site-packages/kallithea/public | diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -4,8 +4,8 @@ import os import sys import platform -if sys.version_info < (2, 5): - raise Exception('Kallithea requires python 2.5 or later') +if sys.version_info < (2, 6): + raise Exception('Kallithea requires python 2.6 or 2.7') here = os.path.abspath(os.path.dirname(__file__)) @@ -58,9 +58,6 @@ requirements = [ "Routes==1.13", ] -if sys.version_info < (2, 6): - requirements.append("pysqlite") - if sys.version_info < (2, 7): requirements.append("importlib==1.0.1") requirements.append("unittest2") @@ -89,7 +86,6 @@ classifiers = [ 'License :: OSI Approved :: GNU General Public License (GPL)', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.5', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Software Development :: Version Control',