tags 729412 + pending
thanks

Dear maintainer,

I've prepared an NMU for python-django-south (versioned as 0.7.5-1.1)
and uploaded it to DELAYED/7. Please feel free to cancel it if you would
rather upload a fixed version.

Regards.

-- 
Luke Faraone;; Debian & Ubuntu Developer; Sugar Labs, Systems
lfaraone on irc.[freenode,oftc].net -- http://luke.faraone.cc
PGP fprint: 5189 2A7D 16D0 49BB 046B DC77 9732 5DD8 F9FD D506
reverted:
--- python-django-south-0.7.5/South.egg-info/PKG-INFO.debdiff
+++ python-django-south-0.7.5.orig/South.egg-info/PKG-INFO.debdiff
@@ -1,19 +0,0 @@
-Metadata-Version: 1.1
-Name: South
-Version: 0.7.4
-Summary: South: Migrations for Django
-Home-page: http://south.aeracode.org/
-Author: Andrew Godwin & Andy McCurdy
-Author-email: so...@aeracode.org
-License: UNKNOWN
-Download-URL: http://south.aeracode.org/wiki/Download
-Description: South is an intelligent database migrations library for the Django web framework. It is database-independent and DVCS-friendly, as well as a whole host of other features.
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development
reverted:
--- python-django-south-0.7.5/South.egg-info/top_level.txt.debdiff
+++ python-django-south-0.7.5.orig/South.egg-info/top_level.txt.debdiff
@@ -1 +0,0 @@
-south
reverted:
--- python-django-south-0.7.5/South.egg-info/SOURCES.txt.debdiff
+++ python-django-south-0.7.5.orig/South.egg-info/SOURCES.txt.debdiff
@@ -1,117 +0,0 @@
-README
-setup.py
-South.egg-info/PKG-INFO
-South.egg-info/SOURCES.txt
-South.egg-info/dependency_links.txt
-South.egg-info/top_level.txt
-south/__init__.py
-south/exceptions.py
-south/logger.py
-south/models.py
-south/modelsinspector.py
-south/orm.py
-south/signals.py
-south/v2.py
-south/creator/__init__.py
-south/creator/actions.py
-south/creator/changes.py
-south/creator/freezer.py
-south/db/__init__.py
-south/db/firebird.py
-south/db/generic.py
-south/db/mysql.py
-south/db/oracle.py
-south/db/postgresql_psycopg2.py
-south/db/sqlite3.py
-south/db/sql_server/__init__.py
-south/db/sql_server/pyodbc.py
-south/hacks/__init__.py
-south/hacks/django_1_0.py
-south/introspection_plugins/__init__.py
-south/introspection_plugins/annoying_autoonetoone.py
-south/introspection_plugins/django_audit_log.py
-south/introspection_plugins/django_objectpermissions.py
-south/introspection_plugins/django_tagging.py
-south/introspection_plugins/django_taggit.py
-south/introspection_plugins/django_timezones.py
-south/introspection_plugins/geodjango.py
-south/management/__init__.py
-south/management/commands/__init__.py
-south/management/commands/convert_to_south.py
-south/management/commands/datamigration.py
-south/management/commands/graphmigrations.py
-south/management/commands/migrate.py
-south/management/commands/migrationcheck.py
-south/management/commands/schemamigration.py
-south/management/commands/startmigration.py
-south/management/commands/syncdb.py
-south/management/commands/test.py
-south/management/commands/testserver.py
-south/migration/__init__.py
-south/migration/base.py
-south/migration/migrators.py
-south/migration/utils.py
-south/tests/__init__.py
-south/tests/autodetection.py
-south/tests/db.py
-south/tests/db_mysql.py
-south/tests/freezer.py
-south/tests/inspector.py
-south/tests/logger.py
-south/tests/logic.py
-south/tests/brokenapp/__init__.py
-south/tests/brokenapp/models.py
-south/tests/brokenapp/migrations/0001_depends_on_unmigrated.py
-south/tests/brokenapp/migrations/0002_depends_on_unknown.py
-south/tests/brokenapp/migrations/0003_depends_on_higher.py
-south/tests/brokenapp/migrations/0004_higher.py
-south/tests/brokenapp/migrations/__init__.py
-south/tests/circular_a/__init__.py
-south/tests/circular_a/models.py
-south/tests/circular_a/migrations/0001_first.py
-south/tests/circular_a/migrations/__init__.py
-south/tests/circular_b/__init__.py
-south/tests/circular_b/models.py
-south/tests/circular_b/migrations/0001_first.py
-south/tests/circular_b/migrations/__init__.py
-south/tests/deps_a/__init__.py
-south/tests/deps_a/models.py
-south/tests/deps_a/migrations/0001_a.py
-south/tests/deps_a/migrations/0002_a.py
-south/tests/deps_a/migrations/0003_a.py
-south/tests/deps_a/migrations/0004_a.py
-south/tests/deps_a/migrations/0005_a.py
-south/tests/deps_a/migrations/__init__.py
-south/tests/deps_b/__init__.py
-south/tests/deps_b/models.py
-south/tests/deps_b/migrations/0001_b.py
-south/tests/deps_b/migrations/0002_b.py
-south/tests/deps_b/migrations/0003_b.py
-south/tests/deps_b/migrations/0004_b.py
-south/tests/deps_b/migrations/0005_b.py
-south/tests/deps_b/migrations/__init__.py
-south/tests/deps_c/__init__.py
-south/tests/deps_c/models.py
-south/tests/deps_c/migrations/0001_c.py
-south/tests/deps_c/migrations/0002_c.py
-south/tests/deps_c/migrations/0003_c.py
-south/tests/deps_c/migrations/0004_c.py
-south/tests/deps_c/migrations/0005_c.py
-south/tests/deps_c/migrations/__init__.py
-south/tests/emptyapp/__init__.py
-south/tests/emptyapp/models.py
-south/tests/emptyapp/migrations/__init__.py
-south/tests/fakeapp/__init__.py
-south/tests/fakeapp/models.py
-south/tests/fakeapp/migrations/0001_spam.py
-south/tests/fakeapp/migrations/0002_eggs.py
-south/tests/fakeapp/migrations/0003_alter_spam.py
-south/tests/fakeapp/migrations/__init__.py
-south/tests/otherfakeapp/__init__.py
-south/tests/otherfakeapp/models.py
-south/tests/otherfakeapp/migrations/0001_first.py
-south/tests/otherfakeapp/migrations/0002_second.py
-south/tests/otherfakeapp/migrations/0003_third.py
-south/tests/otherfakeapp/migrations/__init__.py
-south/utils/__init__.py
-south/utils/datetime_utils.py
\ No newline at end of file
reverted:
--- python-django-south-0.7.5/South.egg-info/dependency_links.txt.debdiff
+++ python-django-south-0.7.5.orig/South.egg-info/dependency_links.txt.debdiff
@@ -1 +0,0 @@
-
diff -u python-django-south-0.7.5/debian/changelog python-django-south-0.7.5/debian/changelog
--- python-django-south-0.7.5/debian/changelog
+++ python-django-south-0.7.5/debian/changelog
@@ -1,3 +1,11 @@
+python-django-south (0.7.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove extraneous debdiff files.
+  * Resolve compatibility issues with Django 1.6. (Closes: #729412)
+
+ -- Luke Faraone <lfara...@debian.org>  Thu, 07 Nov 2013 17:42:57 -0500
+
 python-django-south (0.7.5-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- python-django-south-0.7.5.orig/south/hacks/django_1_0.py
+++ python-django-south-0.7.5/south/hacks/django_1_0.py
@@ -2,6 +2,7 @@
 Hacks for the Django 1.0/1.0.2 releases.
 """
 
+import django
 from django.conf import settings
 from django.db import models
 from django.db.backends.creation import BaseDatabaseCreation
@@ -51,7 +52,7 @@
         """
         a = AppCache()
         a.loaded = False
-        a.handled = {}
+        a.handled = set() if django.VERSION >= (1, 6) else {}
         a.postponed = []
         a.app_store = SortedDict()
         a.app_models = SortedDict()
only in patch2:
unchanged:
--- python-django-south-0.7.5.orig/south/management/commands/datamigration.py
+++ python-django-south-0.7.5/south/management/commands/datamigration.py
@@ -103,7 +103,7 @@
 
 
 MIGRATION_TEMPLATE = """# -*- coding: utf-8 -*-
-import datetime
+from south.utils import datetime_utils as datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
only in patch2:
unchanged:
--- python-django-south-0.7.5.orig/south/management/commands/schemamigration.py
+++ python-django-south-0.7.5/south/management/commands/schemamigration.py
@@ -173,7 +173,7 @@
 
 
 MIGRATION_TEMPLATE = """# -*- coding: utf-8 -*-
-import datetime
+from south.utils import datetime_utils as datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
only in patch2:
unchanged:
--- python-django-south-0.7.5.orig/south/test_shim.py
+++ python-django-south-0.7.5/south/test_shim.py
@@ -0,0 +1,6 @@
+"""
+This file is needed as 1.6 only finds tests in files labelled test_*,
+and ignores tests/__init__.py.
+"""
+
+from south.tests import *
only in patch2:
unchanged:
--- python-django-south-0.7.5.orig/south/v2.py
+++ python-django-south-0.7.5/south/v2.py
@@ -9,7 +9,9 @@
     
     def gf(self, field_name):
         "Gets a field by absolute reference."
-        return ask_for_it_by_name(field_name)
+        field = ask_for_it_by_name(field_name)
+        field.model = FakeModel
+        return field
 
 class SchemaMigration(BaseMigration):
     pass
@@ -17,3 +19,7 @@
 class DataMigration(BaseMigration):
     # Data migrations shouldn't be dry-run
     no_dry_run = True
+
+class FakeModel(object):
+    "Fake model so error messages on fields don't explode"
+    pass

Attachment: signature.asc
Description: Digital signature

Reply via email to