update from remote master

.coveragerc

@@ -0,0 +1,5 @@
+[report]
+omit =
+tests/*
+*/python?.?/*
+*/site-packages/nose/*

.travis.yml

@@ -1,13 +1,32 @@
 language: python
 python:
   - "3.2"
-  - "3.3"
-  - "3.4"
+#  - "3.3"
+#  - "3.4"
+
+addons:
+  postgresql: "9.3"
+
 # command to install dependencies
+# Note: there's an echo at the end of pip install. It allows to override the default return code which is not 0
+# because some packages need to be ugraded to python3 (invalid python syntax because of python2 source code)
+#
+# pip install -r is run 2 times in order to really install tgapp-resetpassword (to investigate)
+#
 install:
-  - "cd tracim && python setup.py develop && cd -"
-  - "pip install -r install/requirements.txt"
-  - "./bin/tg2env-patch tg2env/"
+  - "cd tracim && python setup.py develop; cd -"
+  - "pip install -r install/requirements.txt; echo"
+  - "./bin/tg2env-patch 1 /home/travis/virtualenv/python3.2.5/lib/python3.2/site-packages"
+  - "pip install -r install/requirements.txt; echo"
+  - "./bin/tg2env-patch 2 /home/travis/virtualenv/python3.2.5/lib/python3.2/site-packages"
+  - "pip install coveralls"
   
+before_script:
+  - "psql -c 'create database tracim_test;' -U postgres"
+  - "cp tracim/development.ini.base tracim/development.ini"
+
 # command to run tests
-script: nosetests --with-coverage --cover-package=tracim
+script: "cd tracim && nosetests -v --with-coverage --cover-package=tracim --cover-erase"
+
+after_success:
+- coveralls

README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://travis-ci.org/tracim/tracim.svg?branch=master)](https://travis-ci.org/tracim/tracim)
+[![Coverage Status](https://img.shields.io/coveralls/tracim/tracim.svg)](https://coveralls.io/r/tracim/tracim)
+
 # Tracim - Introduction #
 
 Tracim is a collaborative software designed to allow people to share and work on various data and document types.
@@ -142,14 +145,16 @@ conflict between system-wide python installation and Tracim required ones.
     source tg2env/bin/activate
     cd tracim && python setup.py develop && cd -
     pip install -r install/requirements.txt
-    ./bin/tg2env-patch tg2env/
+    ./bin/tg2env-patch 1 tg2env/lib/python3.2/site-packages
+    pip install -r install/requirements.txt
+    ./bin/tg2env-patch 2 tg2env/lib/python3.2/site-packages
     
 Notes:
 
+* Patchs are applied in a two-step process because some dependencies require to be patched before other packages installation
 * Debian: you may get errors with stevedore/pbr which is not supported by python 3.2
 (debian version of python 3). This is not a real problem
-* Ubuntu (at least 14.04): you should remove _distribute_ and _wsgiref _
-  from the requirements.txt file
+* Ubuntu (at least 14.04): please update the site-package path with your version of python
 
 ## Database Setup ##
 

bin/tg2env-patch

@@ -7,7 +7,7 @@ import sys
 
 def usage():
     print('')
-    print('USAGE: '+__file__+' <virtualenv_folder_path>')
+    print('USAGE: '+__file__+' <step_1_or2> <site_packages_folder_path> ')
     print('')
     print('')
 
@@ -30,7 +30,7 @@ def on_result_and_exit(error_code):
 #######
 
 
-if len(sys.argv)<=1:
+if len(sys.argv)<=2:
     show_help_and_exit()
 
 ########################################
@@ -39,53 +39,60 @@ if len(sys.argv)<=1:
 #
 ########################################
 
-tg2env_path = sys.argv[1]
+patch_step = sys.argv[1]
+sitepackages_path = sys.argv[2]
 
 print('PATCHING PYTHON CODE')
 print('--------------------')
-print('tg2env path:    %s'%(tg2env_path))
+print('site packages path:    %s'%(sitepackages_path))
 print('')
 
-patchable_paths = [
-    tg2env_path+'/lib/python3*/site-packages/tgext/pluggable',
-    tg2env_path+'/lib/python3*/site-packages/resetpassword',
-    tg2env_path+'/lib/python3*/site-packages/babel'
-]
+if patch_step=='1':
+
+    patchable_paths = [
+        sitepackages_path+'/tgext/pluggable',
+        sitepackages_path+'/resetpassword',
+        sitepackages_path+'/babel'
+    ]
+
+    for patchable_path in patchable_paths:
+        print('2to3 conversion for %s...' % (patchable_path))
+        os.system('2to3 -w %s'%(patchable_path))
+        print('-> done')
+
+    babel_source_code_patch_content = """--- tg2env/lib/python3.2/site-packages/babel/messages/pofile.py 2014-11-07 15:35:14.039913184 +0100
+    +++ tg2env/lib/python3.2/site-packages/babel/messages/pofile.py 2014-10-30 17:37:36.295091573 +0100
+    @@ -384,8 +384,13 @@
+     
+         def _write(text):
+             if isinstance(text, text_type):
+    -            text = text.encode(catalog.charset, 'backslashreplace')
+    -        fileobj.write(text)
+    +            pass
+    +            # text = text.encode(catalog.charset, 'backslashreplace')
+    +        try:
+    +            fileobj.write(text.encode('UTF-8'))
+    +        except Exception as e:
+    +            fileobj.write(text)
+    +        
+     
+         def _write_comment(comment, prefix=''):
+             # xgettext always wraps comments even if --no-wrap is passed;
+    """
+
+    babel_patchable_file_path = sitepackages_path+'/babel/messages/pofile.py'
+    print('Patching code in file %s...'%(babel_patchable_file_path))
+    os.system('echo "%s"|patch -p1 %s'%(babel_source_code_patch_content, babel_patchable_file_path))
+    print('-> done')
 
-for patchable_path in patchable_paths:
-    print('2to3 conversion for %s...' % (patchable_path))
-    os.system('2to3 -w %s'%(patchable_path))
+elif patch_step=='2':
+    resetpassword_patchable_file_path = sitepackages_path+'/resetpassword/lib/__init__.py'
+    print('Patching code in file %s...'%(resetpassword_patchable_file_path))
+    os.system("sed -i 's/body\.encode/body/g' %s" % (resetpassword_patchable_file_path))
     print('-> done')
 
-babel_source_code_patch_content = """--- tg2env/lib/python3.2/site-packages/babel/messages/pofile.py 2014-11-07 15:35:14.039913184 +0100
-+++ tg2env/lib/python3.2/site-packages/babel/messages/pofile.py 2014-10-30 17:37:36.295091573 +0100
-@@ -384,8 +384,13 @@
- 
-     def _write(text):
-         if isinstance(text, text_type):
--            text = text.encode(catalog.charset, 'backslashreplace')
--        fileobj.write(text)
-+            pass
-+            # text = text.encode(catalog.charset, 'backslashreplace')
-+        try:
-+            fileobj.write(text.encode('UTF-8'))
-+        except Exception as e:
-+            fileobj.write(text)
-+        
- 
-     def _write_comment(comment, prefix=''):
-         # xgettext always wraps comments even if --no-wrap is passed;
-"""
-
-babel_patchable_file_path = tg2env_path+'/lib/python*/site-packages/babel/messages/pofile.py'
-print('Patching code in file %s...'%(babel_patchable_file_path))
-os.system('echo "%s"|patch -p1 %s'%(babel_source_code_patch_content, babel_patchable_file_path))
-print('-> done')
-
-resetpassword_patchable_file_path = tg2env_path+'/lib/python*/site-packages/resetpassword/lib/__init__.py'
-print('Patching code in file %s...'%(resetpassword_patchable_file_path))
-os.system("sed -i 's/body\.encode/body/g' %s" % (resetpassword_patchable_file_path))
-print('-> done')
+else:
+    show_help_and_exit()
 
 print('')
 print('')

install/requirements.txt

@@ -1,43 +1,50 @@
-Beaker
-FormEncode
-Genshi
-Mako
-MarkupSafe
-PasteDeploy
-SQLAlchemy
-Tempita
-TurboGears2
-WebOb
-WebTest
-alembic
-backlash
-beautifulsoup4
-cliff
-cmd2
-crank
-decorator
-distribute
-gearbox
-prettytable
-psycopg2
-pyparsing
-repoze.lru
-repoze.who
-six
-speaklater
-sprox
-stevedore
-tg.devtools
-tgext.admin
-tgext.crud
-transaction
-tw2.core
-tw2.forms
-wsgiref
-zope.interface
-zope.sqlalchemy
-cherrypy
-tgext.pluggable
-tgapp-resetpassword
-tgext.asyncjob
-babel
+Babel==1.3
+Beaker==1.6.4
+CherryPy==3.6.0
+FormEncode==1.3.0a1
+Genshi==0.7
+Mako==1.0.0
+MarkupSafe==0.15
+PasteDeploy==1.5.2
+SQLAlchemy==0.9.8
+Tempita==0.5.3dev
+TurboGears2==2.3.4
+WebOb==1.4
+WebTest==1.4.2
+alembic==0.6.7
+argparse==1.2.1
+backlash==0.0.6
+beautifulsoup4==4.3.2
+cliff==1.8.0
+cmd2==0.6.7
+coverage==4.0a1
+crank==0.7.1
+decorator==3.4.0
+gearbox==0.0.6
+itsdangerous==0.24
+nose==1.3.4
+pbr==0.10.0
+prettytable==0.7.2
+psycopg2==2.5.4
+pyparsing==2.0.3
+pytz==2014.7
+repoze.lru==0.6
+repoze.who==2.2
+six==1.8.0
+speaklater==1.3
+sprox==0.9.4
+stevedore==1.1.0
+tg.devtools==2.3.4
+tgext.admin==0.6.4
+tgext.asyncjob==0.3.1
+tgext.crud==0.7.3
+tgext.pluggable==0.5.2
+transaction==1.4.3
+tw2.core==2.2.2
+tw2.forms==2.2.2.1
+waitress==0.8.9
+wsgiref==0.1.2
+zope.interface==4.1.1
+zope.sqlalchemy==0.7.5
+tgapp-resetpassword==0.1.3
+

tracim/test.ini

@@ -11,7 +11,7 @@ smtp_server = localhost
 error_email_from = turbogears@localhost
 
 [server:main]
-use = egg:gearbox#wsgiref
+use = egg:gearbox#cherrypy
 host = 127.0.0.1
 port = 8080