Changeset - 6eaa2395a80e
[Not reviewed]
default
0 4 0
Marcin Kuzminski - 14 years ago 2012-05-15 23:07:59
marcin@python-works.com
small issue fixes
3 files changed with 19 insertions and 4 deletions:
0 comments (0 inline, 0 general)
docs/changelog.rst
Show inline comments
 
@@ -4,6 +4,20 @@
 
Changelog
 
=========
 

	
 
1.3.6 (**2012-05-16**)
 
----------------------
 

	
 
news
 
++++
 

	
 

	
 
fixes
 
+++++
 

	
 
- fixed no scm found warning
 
- fixed __future__ import error on rcextensions
 
- made simplejson required lib for speedup on JSON encoding
 

	
 
1.3.5 (**2012-05-10**)
 
----------------------
 

	
rhodecode/__init__.py
Show inline comments
 
@@ -26,11 +26,11 @@
 
import sys
 
import platform
 

	
 
VERSION = (1, 3, 5)
 
VERSION = (1, 3, 6)
 

	
 
try:
 
    from rhodecode.lib import get_current_revision
 
    _rev = get_current_revision()
 
    _rev = get_current_revision(quite=True)
 
    if _rev and len(VERSION) > 3:
 
        VERSION += ('dev%s' % _rev[0],)
 
except ImportError:
 
@@ -65,10 +65,10 @@ requirements = [
 
    "webob==1.0.8",
 
    "markdown==2.1.1",
 
    "docutils==0.8.1",
 
    "simplejson==2.5.2",
 
]
 

	
 
if __py_version__ < (2, 6):
 
    requirements.append("simplejson")
 
    requirements.append("pysqlite")
 

	
 
if is_windows:
rhodecode/config/rcextensions/make_rcextensions.py
Show inline comments
 
@@ -22,12 +22,13 @@
 
#
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
from __future__ import with_statement
 

	
 
import os
 
import sys
 
import pkg_resources
 
import traceback
 
import logging
 
from __future__ import with_statement
 
from os.path import dirname as dn, join as jn
 

	
 
#to get the rhodecode import
0 comments (0 inline, 0 general)