[#2555] [#2601] Bugfixes + version 1.1

diff --git a/CHANGES b/CHANGES
index a997016..0c17a70 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.1
+===
+
+* Bugfix: on devait ajouter auf.recipe.django aux eggs (#2555)
+
+* Bugfix: les scripts plantaient lorsque les eggs d'apps étaient zippés (#2601)
+
 1.0
 ====
 

diff --git a/auf/recipe/django/manage.py b/auf/recipe/django/manage.py
index 4935047..c1c401f 100644 (file)
--- a/auf/recipe/django/manage.py
+++ b/auf/recipe/django/manage.py
@@ -81,7 +81,7 @@ def find_management_module(app_name):
         # of the app_name but the project directory itself isn't on the path.
         try:
             modules = find_modules(part, paths)
-            paths = [m[1] for m in modules]
+            paths = [m[1] for m in modules if isinstance(m, tuple)]
         except ImportError,e:
             if os.path.basename(os.getcwd()) != part:
                 raise e

diff --git a/auf/recipe/django/recipe.py b/auf/recipe/django/recipe.py
index aae5cec..abcc991 100644 (file)
--- a/auf/recipe/django/recipe.py
+++ b/auf/recipe/django/recipe.py
@@ -27,7 +27,7 @@ class Recipe(OriginalDjangoRecipe):
         project_dir = os.path.join(base_dir, self.options['project'])
 
         extra_paths = self.get_extra_paths()
-        requirements, ws = self.egg.working_set(['djangorecipe'])
+        requirements, ws = self.egg.working_set(['auf.recipe.django'])
 
         script_paths = []
 

diff --git a/setup.py b/setup.py
index d49ade9..42de6ba 100644 (file)
--- 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.0'
+version = '1.1'
 
 setup(name=name,
       version=version,
@@ -23,7 +23,7 @@ setup(name=name,
           'setuptools',
           'zc.buildout',
           'zc.recipe.egg',
-          'djangorecipe',
+          'djangorecipe>=0.23.1',
       ],
       entry_points="""
       # -*- Entry points: -*-