Show More
@@ -4,6 +4,20 b'' | |||
|
4 | 4 | Changelog |
|
5 | 5 | ========= |
|
6 | 6 | |
|
7 | 1.3.6 (**2012-05-16**) | |
|
8 | ---------------------- | |
|
9 | ||
|
10 | news | |
|
11 | ++++ | |
|
12 | ||
|
13 | ||
|
14 | fixes | |
|
15 | +++++ | |
|
16 | ||
|
17 | - fixed no scm found warning | |
|
18 | - fixed __future__ import error on rcextensions | |
|
19 | - made simplejson required lib for speedup on JSON encoding | |
|
20 | ||
|
7 | 21 | 1.3.5 (**2012-05-10**) |
|
8 | 22 | ---------------------- |
|
9 | 23 |
@@ -26,11 +26,11 b'' | |||
|
26 | 26 | import sys |
|
27 | 27 | import platform |
|
28 | 28 | |
|
29 |
VERSION = (1, 3, |
|
|
29 | VERSION = (1, 3, 6) | |
|
30 | 30 | |
|
31 | 31 | try: |
|
32 | 32 | from rhodecode.lib import get_current_revision |
|
33 | _rev = get_current_revision() | |
|
33 | _rev = get_current_revision(quite=True) | |
|
34 | 34 | if _rev and len(VERSION) > 3: |
|
35 | 35 | VERSION += ('dev%s' % _rev[0],) |
|
36 | 36 | except ImportError: |
@@ -65,10 +65,10 b' requirements = [' | |||
|
65 | 65 | "webob==1.0.8", |
|
66 | 66 | "markdown==2.1.1", |
|
67 | 67 | "docutils==0.8.1", |
|
68 | "simplejson==2.5.2", | |
|
68 | 69 | ] |
|
69 | 70 | |
|
70 | 71 | if __py_version__ < (2, 6): |
|
71 | requirements.append("simplejson") | |
|
72 | 72 | requirements.append("pysqlite") |
|
73 | 73 | |
|
74 | 74 | if is_windows: |
@@ -22,12 +22,13 b'' | |||
|
22 | 22 | # |
|
23 | 23 | # You should have received a copy of the GNU General Public License |
|
24 | 24 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
25 | from __future__ import with_statement | |
|
26 | ||
|
25 | 27 | import os |
|
26 | 28 | import sys |
|
27 | 29 | import pkg_resources |
|
28 | 30 | import traceback |
|
29 | 31 | import logging |
|
30 | from __future__ import with_statement | |
|
31 | 32 | from os.path import dirname as dn, join as jn |
|
32 | 33 | |
|
33 | 34 | #to get the rhodecode import |
General Comments 0
You need to be logged in to leave comments.
Login now