allow a two step patch process compatible with Travis CI

.travis.yml

@@ -16,8 +16,9 @@ addons:
 install:
   - "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 /home/travis/virtualenv/python3.2.5"
+  - "./bin/tg2env-patch 2 /home/travis/virtualenv/python3.2.5/lib/python3.2/site-packages"
   
 before_script:
   - "psql -c 'create database tracim_test;' -U postgres"

README.md

@@ -142,14 +142,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('')