From 19d7fb26dd8492abd284d393f56439c83390543b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Fri, 24 Feb 2012 13:32:47 -0500 Subject: [PATCH] 1.3 --- CHANGES | 5 +++++ auf/recipe/django/__init__.py | 9 +++++++++ auf/recipe/django/boilerplate.py | 35 +++++++++++++++++++++++++++++++++++ setup.py | 2 +- 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 990ae97..d7d5bd0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.3 +=== + +* ajustement bin/* générés pour fixer les problèmes de namespaces + 1.2 === diff --git a/auf/recipe/django/__init__.py b/auf/recipe/django/__init__.py index 4214e62..bbe6dde 100644 --- a/auf/recipe/django/__init__.py +++ b/auf/recipe/django/__init__.py @@ -1,3 +1,12 @@ # -*- encoding: utf-8 -*- +import zc.buildout +import djangorecipe.boilerplate +from boilerplate import auf_script_template, auf_buildout_file + +# surcharge du tpl de base de buildout pour generer le script dans bin +djangorecipe.boilerplate.script_template = auf_script_template +zc.buildout.easy_install.script_template = auf_buildout_file + + from recipe import Recipe diff --git a/auf/recipe/django/boilerplate.py b/auf/recipe/django/boilerplate.py index 661aa16..3aa64a4 100644 --- a/auf/recipe/django/boilerplate.py +++ b/auf/recipe/django/boilerplate.py @@ -1,4 +1,39 @@ # -*- encoding: utf-8 -*- +import zc.buildout.easy_install + + +env = ''' +%(relative_paths_setup)s +import sys +import pkg_resources + +eggs_path = [ + %(path)s, + ] + +sys.path[0:0] = eggs_path + +# correction des namespaces virtuels +for egg_path in eggs_path: + pkg_resources.fixup_namespace_packages(egg_path) +%(initialization)s +import %(module_name)s +''' + +auf_buildout_file = zc.buildout.easy_install.script_header + env + '''\ +if __name__ == '__main__': + %(module_name)s.%(attrs)s(%(arguments)s) +''' + +auf_script_template = { + 'wsgi': env + """ +application = %(module_name)s.%(attrs)s(%(arguments)s) +""", + 'fcgi': env + """ +%(module_name)s.%(attrs)s(%(arguments)s) +""", +} + ################################################################################ # SETTINGS diff --git a/setup.py b/setup.py index d6df534..4cb7fd9 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages import sys, os name = 'auf.recipe.django' -version = '1.2' +version = '1.3' setup(name=name, version=version, -- 1.7.10.4