From e96ee2bbe12a96700604ac82c5e425db1ac2229b Mon Sep 17 00:00:00 2001 From: Chris Sinchok Date: Thu, 15 May 2014 15:39:54 -0500 Subject: [PATCH] Switching to django-betty-cropper --- bulbs/__init__.py | 2 +- bulbs/content/migrations/0001_initial.py | 4 ++-- bulbs/content/models.py | 2 +- bulbs/promotion/migrations/0001_initial.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bulbs/__init__.py b/bulbs/__init__.py index f1380eed..9cb17e79 100644 --- a/bulbs/__init__.py +++ b/bulbs/__init__.py @@ -1 +1 @@ -__version__ = "0.1.7" +__version__ = "0.1.8" diff --git a/bulbs/content/migrations/0001_initial.py b/bulbs/content/migrations/0001_initial.py index 6232bb67..adfaaf62 100644 --- a/bulbs/content/migrations/0001_initial.py +++ b/bulbs/content/migrations/0001_initial.py @@ -40,7 +40,7 @@ def forwards(self, orm): ('title', self.gf('django.db.models.fields.CharField')(max_length=512)), ('slug', self.gf('django.db.models.fields.SlugField')(default='', max_length=50, blank=True)), ('description', self.gf('django.db.models.fields.TextField')(default='', max_length=1024, blank=True)), - ('image', self.gf('betty.cropped.fields.ImageField')(default=None, null=True, blank=True)), + ('image', self.gf('djbetty.fields.ImageField')(default=None, null=True, blank=True)), ('feature_type', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)), ('subhead', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)), ('indexed', self.gf('django.db.models.fields.BooleanField')(default=True)), @@ -105,7 +105,7 @@ def backwards(self, orm): 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}), 'feature_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('betty.cropped.fields.ImageField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'image': ('djbetty.fields.ImageField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), 'indexed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'last_modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now': 'True', 'blank': 'True'}), 'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_content.content_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}), diff --git a/bulbs/content/models.py b/bulbs/content/models.py index adf74ea9..3ca36fbf 100644 --- a/bulbs/content/models.py +++ b/bulbs/content/models.py @@ -22,7 +22,7 @@ from .shallow import ShallowContentS, ShallowContentResult -from betty.cropped.fields import ImageField +from djbetty import ImageField try: from bulbs.content.tasks import index as index_task # noqa diff --git a/bulbs/promotion/migrations/0001_initial.py b/bulbs/promotion/migrations/0001_initial.py index cd154db3..49fec8c9 100644 --- a/bulbs/promotion/migrations/0001_initial.py +++ b/bulbs/promotion/migrations/0001_initial.py @@ -118,7 +118,7 @@ def backwards(self, orm): 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}), 'feature_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('betty.cropped.fields.ImageField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'image': ('djbetty.fields.ImageField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), 'indexed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'last_modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now': 'True', 'blank': 'True'}), 'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_content.content_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}), diff --git a/requirements.txt b/requirements.txt index bade32f6..c024e7ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Django>=1.4 South==0.8.1 -betty-cropper==0.1.21 +django-betty-cropper==0.1.1 djangorestframework==2.3.13 django-elastimorphic==0.0.2 django_polymorphic==0.5.1 diff --git a/setup.py b/setup.py index ab5274d9..49af55ae 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ requires = [ "Django>=1.4", "South==0.8.1", - "betty-cropper==0.1.21", + "django-betty-cropper==0.1.1", "django-elastimorphic==0.0.2", "django-json-field==0.5.5", "django_polymorphic==0.5.1",