update nant-tic modules, comment some third-party modules

bootstrap.py

@@ -18,7 +18,11 @@ The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
 """
 
-import os, shutil, sys, tempfile
+import os
+import shutil
+import sys
+import tempfile
+
 from optparse import OptionParser
 
 tmpeggs = tempfile.mkdtemp()
@@ -31,8 +35,8 @@ Bootstraps a buildout-based project.
 Simply run this script in a directory containing a buildout.cfg, using the
 Python that you want bin/buildout to use.
 
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
+Note that by using --find-links to point to local resources, you can keep 
+this script from going over the network.
 '''
 
 parser = OptionParser(usage=usage)
@@ -48,23 +52,21 @@ parser.add_option("-t", "--accept-buildout-test-releases",
                         "bootstrap and buildout will get the newest releases "
                         "even if they are alphas or betas."))
 parser.add_option("-c", "--config-file",
-                   help=("Specify the path to the buildout configuration "
-                         "file to be used."))
+                  help=("Specify the path to the buildout configuration "
+                        "file to be used."))
 parser.add_option("-f", "--find-links",
-                   help=("Specify a URL to search for buildout releases"))
+                  help=("Specify a URL to search for buildout releases"))
 
 
 options, args = parser.parse_args()
 
 ######################################################################
-# load/install distribute
+# load/install setuptools
 
 to_reload = False
 try:
-    import pkg_resources, setuptools
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        raise ImportError
+    import pkg_resources
+    import setuptools
 except ImportError:
     ez = {}
 
@@ -73,8 +75,10 @@ except ImportError:
     except ImportError:
         from urllib2 import urlopen
 
-    exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
-    setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
+    # XXX use a more permanent ez_setup.py URL when available.
+    exec(urlopen('https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py'
+                ).read(), ez)
+    setup_args = dict(to_dir=tmpeggs, download_delay=0)
     ez['use_setuptools'](**setup_args)
 
     if to_reload:
@@ -89,7 +93,7 @@ except ImportError:
 ######################################################################
 # Install buildout
 
-ws  = pkg_resources.working_set
+ws = pkg_resources.working_set
 
 cmd = [sys.executable, '-c',
        'from setuptools.command.easy_install import main; main()',
@@ -104,8 +108,8 @@ find_links = os.environ.get(
 if find_links:
     cmd.extend(['-f', find_links])
 
-distribute_path = ws.find(
-    pkg_resources.Requirement.parse('distribute')).location
+setuptools_path = ws.find(
+    pkg_resources.Requirement.parse('setuptools')).location
 
 requirement = 'zc.buildout'
 version = options.version
@@ -113,13 +117,14 @@ if version is None and not options.accept_buildout_test_releases:
     # Figure out the most recent final version of zc.buildout.
     import setuptools.package_index
     _final_parts = '*final-', '*final'
+
     def _final_version(parsed_version):
         for part in parsed_version:
             if (part[:1] == '*') and (part not in _final_parts):
                 return False
         return True
     index = setuptools.package_index.PackageIndex(
-        search_path=[distribute_path])
+        search_path=[setuptools_path])
     if find_links:
         index.add_find_links((find_links,))
     req = pkg_resources.Requirement.parse(requirement)
@@ -142,16 +147,11 @@ if version:
 cmd.append(requirement)
 
 import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
     raise Exception(
         "Failed to execute command:\n%s",
         repr(cmd)[1:-1])
 
-# Create 'build' directory
-build_path = os.path.abspath(os.path.join(os.path.dirname(__file__),"build"))
-if not os.path.exists(build_path):
-    os.makedirs(build_path)
-
 ######################################################################
 # Import and run buildout
 

nan-tic.cfg

@@ -2,6 +2,8 @@
 auto-checkout += *
 
 [sources]
+activity = hg ssh://hg@bitbucket.org/nantic/trytond-activity egg=False
+acticity_calendar = hg  ssh://hg@bitbucket.org/nantic/trytond-activity_calendar egg=False
 aeat_303 = hg ssh://hg@hg.nan-tic.com/trytond-aeat_303 egg=False
 aeat_340 = hg ssh://hg@hg.nan-tic.com/trytond-aeat_340 egg=False
 aeat_347 = hg ssh://hg@hg.nan-tic.com/trytond-aeat_347 egg=False
@@ -9,7 +11,6 @@ aeat_349 = hg ssh://hg@hg.nan-tic.com/trytond-aeat_349 egg=False
 frepple = hg ssh://hg@bitbucket.org/nantic/trytond-frepple egg=False
 quality_control = hg ssh://hg@bitbucket.org/nantic/trytond-quality_control egg=False
 quality_control_formula = hg ssh://hg@bitbucket.org/nantic/trytond-quality_control_formula egg=False
-activity = hg ssh://hg@bitbucket.org/nantic/trytond-activity egg=False
 sale_opportunity_activity = hg ssh://hg@bitbucket.org/nantic/trytond-sale_opportunity_activity egg=False
 sale_opportunity_next_action = hg ssh://hg@bitbucket.org/nantic/trytond-sale_opportunity_next_action egg=False
 sale_opportunity_quote = hg ssh://hg@bitbucket.org/nantic/trytond-sale_opportunity_quote egg=False

requirements.txt

@@ -1,31 +1,32 @@
-zc.buildout==2.1.1
-Genshi==0.6
-Jinja2==2.6
-PyWebDAV==0.9.8
-Pygments==1.6
-Sphinx==1.1.3
-argparse==1.2.1
-caldav==0.1.12
-cdecimal==2.3
-chardet==2.1.1
-coverage==3.6
-docutils==0.10
-easyimap==0.3.3
-lxml==3.1.0
-nose==1.2.1
-polib==1.0.2
-psycopg2==2.4.6
-pydot==1.0.28
-pyparsing==1.5.6
-python-dateutil==2.1
-python-ldap==2.4.10
-pytz==2012h
-relatorio==0.5.6
-simplejson==2.6.2
-six==1.2.0
-vobject==0.8.1c
-wsgiref==0.1.2
-yolk==0.4.3
+zc.buildout>=2.1.1
+setuptoots>=0.7
+Genshi>=0.6
+Jinja2>=2.6
+PyWebDAV>=0.9.8
+Pygments>=1.6
+Sphinx>=1.1.3
+argparse>=1.2.1
+caldav>=0.1.12
+cdecimal>=2.3
+chardet>=2.1.1
+coverage>=3.6
+docutils>=0.10
+easyimap>=0.3.3
+lxml>=3.1.0
+nose>=1.2.1
+polib>=1.0.2
+psycopg2>=2.4.6
+pydot>=1.0.28
+pyparsing>=1.5.6
+python-dateutil>=2.1
+python-ldap>=2.4.10
+pytz>=2012h
+relatorio>=0.5.6
+simplejson>=2.6.2
+six>=1.2.0
+vobject>=0.8.1c
+wsgiref>=0.1.2
+yolk>=0.4.3
 
 #nereid
 wtforms-recaptcha

third-party.cfg

@@ -39,7 +39,7 @@ product_price_list_category = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-prod
 product_price_list_formula = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-product_price_list_formula egg=False
 #product_special_price = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-product_special_price egg=False
 #product_variant = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-product_variant egg=False
-project_employee = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-project_employee egg=False
+#project_employee = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-project_employee egg=False
 #project_invoice = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-project_invoice egg=False
 #project_timesheet_invoice = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-project_timesheet_invoice egg=False
 sale_discount_report = hg ssh://hg@bitbucket.org/zikzakmedia/trytond-sale_discount_report egg=False