##// END OF EJS Templates
setup: clarify that we only support 2.6 and 2.7
Mads Kiilerich -
r4522:a9a1560d default
parent child Browse files
Show More
@@ -1,6 +1,5 b''
1 language: python
1 language: python
2 python:
2 python:
3 - "2.5"
4 - "2.6"
3 - "2.6"
5 - "2.7"
4 - "2.7"
6
5
@@ -33,7 +33,7 b' and put all your changes like db connect'
33
33
34 After finishing your changes make sure all tests passes ok. You can run
34 After finishing your changes make sure all tests passes ok. You can run
35 the testsuite running ``nosetest`` from the project root, or if you use tox
35 the testsuite running ``nosetest`` from the project root, or if you use tox
36 run tox for python2.5-2.7 with multiple database test. When using `nosetests`
36 run tox for python2.6-2.7 with multiple database test. When using `nosetests`
37 test.ini file is used and by default it uses sqlite for tests, edit this file
37 test.ini file is used and by default it uses sqlite for tests, edit this file
38 to change your testing enviroment.
38 to change your testing enviroment.
39
39
@@ -14,7 +14,7 b' clients. Minimal version of hg client kn'
14 Installing Kallithea from PyPI (aka "Cheeseshop")
14 Installing Kallithea from PyPI (aka "Cheeseshop")
15 -------------------------------------------------
15 -------------------------------------------------
16
16
17 Kallithea requires python version 2.5 or higher.
17 Kallithea requires python version 2.6 or higher.
18
18
19 The easiest way to install ``kallithea`` is to run::
19 The easiest way to install ``kallithea`` is to run::
20
20
@@ -25,7 +25,7 b' Step1 - Install Visual Studio 2008 Expre'
25 ------------------------------------------
25 ------------------------------------------
26
26
27
27
28 Optional: You can also install MingW, but VS2008 installation is easier
28 Optional: You can also install MinGW, but VS2008 installation is easier.
29
29
30 Download "Visual C++ 2008 Express Edition with SP1" from:
30 Download "Visual C++ 2008 Express Edition with SP1" from:
31 http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
31 http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
@@ -61,7 +61,7 b' choose "Visual C++ 2008 Express" when in'
61 Step2 - Install Python
61 Step2 - Install Python
62 ----------------------
62 ----------------------
63
63
64 Install Python 2.x.y (x >= 5) x86 version (32bit). DO NOT USE A 3.x version.
64 Install Python 2.x.y (x = 6 or 7) x86 version (32bit). DO NOT USE A 3.x version.
65 Download Python 2.x.y from:
65 Download Python 2.x.y from:
66 http://www.python.org/download/
66 http://www.python.org/download/
67
67
@@ -685,7 +685,7 b' Here is a sample excerpt from an Apache '
685
685
686 WSGIDaemonProcess pylons \
686 WSGIDaemonProcess pylons \
687 threads=4 \
687 threads=4 \
688 python-path=/home/web/kallithea/pyenv/lib/python2.6/site-packages
688 python-path=/home/web/kallithea/pyenv/lib/python2.7/site-packages
689 WSGIScriptAlias / /home/web/kallithea/dispatch.wsgi
689 WSGIScriptAlias / /home/web/kallithea/dispatch.wsgi
690 WSGIPassAuthorization On
690 WSGIPassAuthorization On
691
691
@@ -708,7 +708,7 b' Example wsgi dispatch script::'
708 os.chdir('/home/web/kallithea/')
708 os.chdir('/home/web/kallithea/')
709
709
710 import site
710 import site
711 site.addsitedir("/home/web/kallithea/pyenv/lib/python2.6/site-packages")
711 site.addsitedir("/home/web/kallithea/pyenv/lib/python2.7/site-packages")
712
712
713 from paste.deploy import loadapp
713 from paste.deploy import loadapp
714 from paste.script.util.logging_config import fileConfig
714 from paste.script.util.logging_config import fileConfig
@@ -9,7 +9,7 b' Troubleshooting'
9 :A: Make sure either to set the `static_files = true` in the .ini file or
9 :A: Make sure either to set the `static_files = true` in the .ini file or
10 double check the root path for your http setup. It should point to
10 double check the root path for your http setup. It should point to
11 for example:
11 for example:
12 /home/my-virtual-python/lib/python2.6/site-packages/kallithea/public
12 /home/my-virtual-python/lib/python2.7/site-packages/kallithea/public
13
13
14 |
14 |
15
15
@@ -4,8 +4,8 b' import os'
4 import sys
4 import sys
5 import platform
5 import platform
6
6
7 if sys.version_info < (2, 5):
7 if sys.version_info < (2, 6):
8 raise Exception('Kallithea requires python 2.5 or later')
8 raise Exception('Kallithea requires python 2.6 or 2.7')
9
9
10
10
11 here = os.path.abspath(os.path.dirname(__file__))
11 here = os.path.abspath(os.path.dirname(__file__))
@@ -58,9 +58,6 b' requirements = ['
58 "Routes==1.13",
58 "Routes==1.13",
59 ]
59 ]
60
60
61 if sys.version_info < (2, 6):
62 requirements.append("pysqlite")
63
64 if sys.version_info < (2, 7):
61 if sys.version_info < (2, 7):
65 requirements.append("importlib==1.0.1")
62 requirements.append("importlib==1.0.1")
66 requirements.append("unittest2")
63 requirements.append("unittest2")
@@ -89,7 +86,6 b' classifiers = ['
89 'License :: OSI Approved :: GNU General Public License (GPL)',
86 'License :: OSI Approved :: GNU General Public License (GPL)',
90 'Operating System :: OS Independent',
87 'Operating System :: OS Independent',
91 'Programming Language :: Python',
88 'Programming Language :: Python',
92 'Programming Language :: Python :: 2.5',
93 'Programming Language :: Python :: 2.6',
89 'Programming Language :: Python :: 2.6',
94 'Programming Language :: Python :: 2.7',
90 'Programming Language :: Python :: 2.7',
95 'Topic :: Software Development :: Version Control',
91 'Topic :: Software Development :: Version Control',
General Comments 0
You need to be logged in to leave comments. Login now