[#2598] Migration de SEP vers python 2.6

diff --git a/auf_savoirs_en_partage/chercheurs/migrations/0024_renommer_permissions_voir.py b/auf_savoirs_en_partage/chercheurs/migrations/0024_renommer_permissions_voir.py
index 6568bdd..97be182 100644 (file)
--- a/auf_savoirs_en_partage/chercheurs/migrations/0024_renommer_permissions_voir.py
+++ b/auf_savoirs_en_partage/chercheurs/migrations/0024_renommer_permissions_voir.py
@@ -2,25 +2,29 @@
 import datetime
 from south.db import db
 from south.v2 import DataMigration
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 
 class Migration(DataMigration):
 
     def forwards(self, orm):
         "Write your forwards methods here."
-        ct = orm['contenttypes.ContentType'].objects.get(model='chercheur', app_label='chercheurs', name='chercheur')
+        try:
+            ct = orm['contenttypes.ContentType'].objects.get(model='chercheur', app_label='chercheurs', name='chercheur')
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='add_chercheurvoir', content_type=ct)
-        p.name = 'Can add chercheur (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='add_chercheurvoir', content_type=ct)
+            p.name = 'Can add chercheur (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='change_chercheurvoir', content_type=ct)
-        p.name = 'Can change chercheur (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='change_chercheurvoir', content_type=ct)
+            p.name = 'Can change chercheur (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_chercheurvoir', content_type=ct)
-        p.name = 'Can delete chercheur (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_chercheurvoir', content_type=ct)
+            p.name = 'Can delete chercheur (visualisation)'
+            p.save()
+        except ObjectDoesNotExist:
+            pass
 
     def backwards(self, orm):
         "Write your backwards methods here."

diff --git a/auf_savoirs_en_partage/savoirs/migrations/0020_renommer_permissions_voir.py b/auf_savoirs_en_partage/savoirs/migrations/0020_renommer_permissions_voir.py
index ba7eb95..2e216c5 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/migrations/0020_renommer_permissions_voir.py
+++ b/auf_savoirs_en_partage/savoirs/migrations/0020_renommer_permissions_voir.py
@@ -2,39 +2,43 @@
 import datetime
 from south.db import db
 from south.v2 import DataMigration
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 
 class Migration(DataMigration):
 
     def forwards(self, orm):
         "Write your forwards methods here."
-        ct = orm['contenttypes.ContentType'].objects.get(model='actualite', app_label='savoirs', name='actualite')
+        try:
+            ct = orm['contenttypes.ContentType'].objects.get(model='actualite', app_label='savoirs', name='actualite')
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='add_actualitevoir', content_type=ct)
-        p.name = 'Can add actualité (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='add_actualitevoir', content_type=ct)
+            p.name = 'Can add actualité (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='change_actualitevoir', content_type=ct)
-        p.name = 'Can change actualité (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='change_actualitevoir', content_type=ct)
+            p.name = 'Can change actualité (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_actualitevoir', content_type=ct)
-        p.name = 'Can delete actualité (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_actualitevoir', content_type=ct)
+            p.name = 'Can delete actualité (visualisation)'
+            p.save()
 
-        ct = orm['contenttypes.ContentType'].objects.get(model='evenement', app_label='savoirs', name='evenement')
+            ct = orm['contenttypes.ContentType'].objects.get(model='evenement', app_label='savoirs', name='evenement')
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='add_evenementvoir', content_type=ct)
-        p.name = 'Can add événement (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='add_evenementvoir', content_type=ct)
+            p.name = 'Can add événement (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='change_evenementvoir', content_type=ct)
-        p.name = 'Can change événement (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='change_evenementvoir', content_type=ct)
+            p.name = 'Can change événement (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_evenementvoir', content_type=ct)
-        p.name = 'Can delete événement (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_evenementvoir', content_type=ct)
+            p.name = 'Can delete événement (visualisation)'
+            p.save()
+        except ObjectDoesNotExist:
+            pass
 
     def backwards(self, orm):
         "Write your backwards methods here."

diff --git a/auf_savoirs_en_partage/savoirs/tests.py b/auf_savoirs_en_partage/savoirs/tests.py
index f46366c..5a29d30 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/tests.py
+++ b/auf_savoirs_en_partage/savoirs/tests.py
@@ -53,7 +53,7 @@ class PageLoadTest(TestCase):
 
     def test_evenement(self):
         self.check_status_200('/agenda/evenements/1/')
-        
+
     def test_actualites(self):
         self.check_status_200('/actualites/')
         self.check_status_200('/actualites/', {

diff --git a/auf_savoirs_en_partage/sitotheque/migrations/0004_renommer_permissions_voir.py b/auf_savoirs_en_partage/sitotheque/migrations/0004_renommer_permissions_voir.py
index c2f227a..b2cca80 100644 (file)
--- a/auf_savoirs_en_partage/sitotheque/migrations/0004_renommer_permissions_voir.py
+++ b/auf_savoirs_en_partage/sitotheque/migrations/0004_renommer_permissions_voir.py
@@ -2,42 +2,45 @@
 import datetime
 from south.db import db
 from south.v2 import DataMigration
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 
 class Migration(DataMigration):
 
     def forwards(self, orm):
         "Write your forwards methods here."
-        ct = orm['contenttypes.ContentType'].objects.get(model='site', app_label='sitotheque', name='site')
+        try:
+            ct = orm['contenttypes.ContentType'].objects.get(model='site', app_label='sitotheque', name='site')
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='add_sitevoir', content_type=ct)
-        p.name = 'Can add site (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='add_sitevoir', content_type=ct)
+            p.name = 'Can add site (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='change_sitevoir', content_type=ct)
-        p.name = 'Can change site (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='change_sitevoir', content_type=ct)
+            p.name = 'Can change site (visualisation)'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_sitevoir', content_type=ct)
-        p.name = 'Can delete site (visualisation)'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_sitevoir', content_type=ct)
+            p.name = 'Can delete site (visualisation)'
+            p.save()
+        except ObjectDoesNotExist:
+            pass
 
-    def backwards(self, orm):
-        "Write your backwards methods here."
-        ct = orm['contenttypes.ContentType'].objects.get(model='site', app_label='sitotheque', name='site')
+        def backwards(self, orm):
+            "Write your backwards methods here."
+            ct = orm['contenttypes.ContentType'].objects.get(model='site', app_label='sitotheque', name='site')
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='add_sitevoir', content_type=ct)
-        p.name = 'Can add (visualisation) site'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='add_sitevoir', content_type=ct)
+            p.name = 'Can add (visualisation) site'
+            p.save()
 
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='change_sitevoir', content_type=ct)
-        p.name = 'Can change (visualisation) site'
-        p.save()
-
-        p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_sitevoir', content_type=ct)
-        p.name = 'Can delete (visualisation) site'
-        p.save()
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='change_sitevoir', content_type=ct)
+            p.name = 'Can change (visualisation) site'
+            p.save()
 
+            p, created = orm['auth.Permission'].objects.get_or_create(codename='delete_sitevoir', content_type=ct)
+            p.name = 'Can delete (visualisation) site'
+            p.save()
 
     models = {
         'auth.group': {

diff --git a/buildout.cfg b/buildout.cfg
index 2049f20..6e410ea 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -2,7 +2,7 @@
 newest = false
 parts = django articles harvest sphinx_config alertes_courriel
 versions = versions
-find-links = http://pypi.auf.org/caldav/
+find-links =
     http://pypi.auf.org/auf_references_client/
     http://pypi.auf.org/auf_references_modeles/
     http://pypi.auf.org/datamaster_modeles/
@@ -19,13 +19,14 @@ wsgi = true
 version = 1.2.5
 settings = production
 extra-paths = auf_savoirs_en_partage
-eggs = auf_references_client==0.4.9
+eggs =
+    auf_references_client==0.4.9
     Babel==0.9.5
-    caldav==0.1.4.3-auf
+    caldav==0.1.12
     chardet==1.0.1
     pytz==2010l
     feedparser==4.1
-    BeautifulSoup==3.1.0.1
+    BeautifulSoup==3.2.0
     django_compressor==0.5.3
     django_pagination==1.0.7
     django_sorting==0.1
@@ -46,7 +47,6 @@ eggs = auf_references_client==0.4.9
     django-alphafilter==0.5.3auf4
     django-selectable==0.2
 
-
 [articles]
 recipe = buildout_script
 template_dir = ${buildout:directory}/auf_savoirs_en_partage/scripts/