##// END OF EJS Templates
fixed requires files, added distinction on win vs other platforms
marcink -
r1964:b1ad9efe beta
parent child Browse files
Show More
@@ -5,7 +5,6 formencode==1.2.4
5 SQLAlchemy==0.7.4
5 SQLAlchemy==0.7.4
6 Mako==0.5.0
6 Mako==0.5.0
7 pygments>=1.4
7 pygments>=1.4
8 mercurial>=2.0,<2.1
9 whoosh<1.8
8 whoosh<1.8
10 celery>=2.2.5,<2.3
9 celery>=2.2.5,<2.3
11 babel
10 babel
@@ -14,4 +13,6 dulwich>=0.8.0,<0.9.0
14 vcs>=0.2.3.dev
13 vcs>=0.2.3.dev
15 webob==1.0.8
14 webob==1.0.8
16 markdown==2.0.3
15 markdown==2.0.3
17 docutils==0.8.1 No newline at end of file
16 docutils==0.8.1
17 py-bcrypt
18 mercurial>=2.0,<2.1 No newline at end of file
@@ -23,6 +23,7
23 #
23 #
24 # You should have received a copy of the GNU General Public License
24 # You should have received a copy of the GNU General Public License
25 # along with this program. If not, see <http://www.gnu.org/licenses/>.
25 # along with this program. If not, see <http://www.gnu.org/licenses/>.
26 import sys
26 import platform
27 import platform
27
28
28 VERSION = (1, 3, 0, 'beta')
29 VERSION = (1, 3, 0, 'beta')
@@ -30,6 +31,7 VERSION = (1, 3, 0, 'beta')
30 __dbversion__ = 4 # defines current db version for migrations
31 __dbversion__ = 4 # defines current db version for migrations
31 __platform__ = platform.system()
32 __platform__ = platform.system()
32 __license__ = 'GPLv3'
33 __license__ = 'GPLv3'
34 __py_version__ = sys.version_info
33
35
34 PLATFORM_WIN = ('Windows')
36 PLATFORM_WIN = ('Windows')
35 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
37 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
@@ -42,7 +44,6 requirements = [
42 "SQLAlchemy==0.7.4",
44 "SQLAlchemy==0.7.4",
43 "Mako==0.5.0",
45 "Mako==0.5.0",
44 "pygments>=1.4",
46 "pygments>=1.4",
45 "mercurial>=2.0,<2.1",
46 "whoosh<1.8",
47 "whoosh<1.8",
47 "celery>=2.2.5,<2.3",
48 "celery>=2.2.5,<2.3",
48 "babel",
49 "babel",
@@ -54,6 +55,16 requirements = [
54 "docutils==0.8.1",
55 "docutils==0.8.1",
55 ]
56 ]
56
57
58 if __py_version__ < (2, 6):
59 requirements.append("simplejson")
60 requirements.append("pysqlite")
61
62 if __platform__ in PLATFORM_WIN:
63 requirements.append("mercurial==2.0.1")
64 else:
65 requirements.append("py-bcrypt")
66 requirements.append("mercurial>=2.0,<2.1")
67
57
68
58 try:
69 try:
59 from rhodecode.lib import get_current_revision
70 from rhodecode.lib import get_current_revision
@@ -1,8 +1,6
1 import sys
1 import sys
2 from rhodecode import get_version
2 from rhodecode import get_version
3 from rhodecode import __platform__
4 from rhodecode import __license__
3 from rhodecode import __license__
5 from rhodecode import PLATFORM_OTHERS
6 from rhodecode import requirements
4 from rhodecode import requirements
7
5
8 py_version = sys.version_info
6 py_version = sys.version_info
@@ -27,13 +25,6 classifiers = ['Development Status :: 4
27 'Programming Language :: Python :: 2.6',
25 'Programming Language :: Python :: 2.6',
28 'Programming Language :: Python :: 2.7', ]
26 'Programming Language :: Python :: 2.7', ]
29
27
30 if py_version < (2, 6):
31 requirements.append("simplejson")
32 requirements.append("pysqlite")
33
34 if __platform__ in PLATFORM_OTHERS:
35 requirements.append("py-bcrypt")
36
37
28
38 # additional files from project that goes somewhere in the filesystem
29 # additional files from project that goes somewhere in the filesystem
39 # relative to sys.prefix
30 # relative to sys.prefix
General Comments 0
You need to be logged in to leave comments. Login now