Skip to content

Commit 903721b

Browse files
mboersmamboersma
committed
chore(controller): remove unused django-allauth app
1 parent 1d4fe4e commit 903721b

5 files changed

Lines changed: 168 additions & 9 deletions

File tree

‎controller/api/south_migrations/0016_drop_allauth.py‎

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
# -*- coding: utf-8 -*-
2+
from south.utils import datetime_utils as datetime
3+
from south.db import db
4+
from south.v2 import SchemaMigration
5+
from django.db import models
6+
7+
8+
class Migration(SchemaMigration):
9+
10+
def forwards(self, orm):
11+
"Drop django-allauth tables."
12+
tables_to_drop = [
13+
'account_emailaddress',
14+
'account_emailconfirmation',
15+
]
16+
for table in tables_to_drop:
17+
if table in orm:
18+
db.delete_table(table)
19+
from django.contrib.contenttypes.models import ContentType
20+
ContentType.objects.filter(app_label='account').delete()
21+
22+
def backwards(self, orm):
23+
raise RuntimeError('Cannot reverse this migration')
24+
25+
models = {
26+
u'api.app': {
27+
'Meta': {'object_name': 'App'},
28+
'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Cluster']"}),
29+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
30+
'id': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '64'}),
31+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
32+
'structure': ('json_field.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
33+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
34+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
35+
},
36+
u'api.build': {
37+
'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'app', u'uuid'),)", 'object_name': 'Build'},
38+
'app': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.App']"}),
39+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
40+
'dockerfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
41+
'image': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
42+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
43+
'procfile': ('json_field.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
44+
'sha': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
45+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
46+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
47+
},
48+
u'api.cluster': {
49+
'Meta': {'object_name': 'Cluster'},
50+
'auth': ('django.db.models.fields.TextField', [], {}),
51+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
52+
'domain': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
53+
'hosts': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
54+
'id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
55+
'options': ('json_field.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
56+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
57+
'type': ('django.db.models.fields.CharField', [], {'default': "u'coreos'", 'max_length': '16'}),
58+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
59+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
60+
},
61+
u'api.config': {
62+
'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'app', u'uuid'),)", 'object_name': 'Config'},
63+
'app': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.App']"}),
64+
'cpu': ('json_field.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
65+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
66+
'memory': ('json_field.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
67+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
68+
'tags': ('json_field.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
69+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
70+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'}),
71+
'values': ('json_field.fields.JSONField', [], {'default': '{}', 'blank': 'True'})
72+
},
73+
u'api.container': {
74+
'Meta': {'ordering': "[u'created']", 'object_name': 'Container'},
75+
'app': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.App']"}),
76+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
77+
'num': ('django.db.models.fields.PositiveIntegerField', [], {}),
78+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
79+
'release': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Release']"}),
80+
'state': ('django_fsm.FSMField', [], {'default': "u'initialized'", 'max_length': '50'}),
81+
'type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
82+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
83+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
84+
},
85+
u'api.domain': {
86+
'Meta': {'object_name': 'Domain'},
87+
'app': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.App']"}),
88+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
89+
'domain': ('django.db.models.fields.TextField', [], {'unique': 'True'}),
90+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
91+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
92+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
93+
},
94+
u'api.key': {
95+
'Meta': {'unique_together': "((u'owner', u'id'),)", 'object_name': 'Key'},
96+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
97+
'id': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
98+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
99+
'public': ('django.db.models.fields.TextField', [], {'unique': 'True'}),
100+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
101+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
102+
},
103+
u'api.push': {
104+
'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'app', u'uuid'),)", 'object_name': 'Push'},
105+
'app': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.App']"}),
106+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
107+
'fingerprint': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
108+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
109+
'receive_repo': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
110+
'receive_user': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
111+
'sha': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
112+
'ssh_connection': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
113+
'ssh_original_command': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
114+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
115+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
116+
},
117+
u'api.release': {
118+
'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'app', u'version'),)", 'object_name': 'Release'},
119+
'app': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.App']"}),
120+
'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Build']"}),
121+
'config': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Config']"}),
122+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
123+
'image': ('django.db.models.fields.CharField', [], {'default': "u'deis/helloworld'", 'max_length': '256'}),
124+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
125+
'summary': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
126+
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
127+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'}),
128+
'version': ('django.db.models.fields.PositiveIntegerField', [], {})
129+
},
130+
u'auth.group': {
131+
'Meta': {'object_name': 'Group'},
132+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
133+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
134+
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
135+
},
136+
u'auth.permission': {
137+
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
138+
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
139+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
140+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
141+
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
142+
},
143+
u'auth.user': {
144+
'Meta': {'object_name': 'User'},
145+
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
146+
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
147+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
148+
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
149+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
150+
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
151+
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
152+
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
153+
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
154+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
155+
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
156+
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
157+
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
158+
},
159+
u'contenttypes.contenttype': {
160+
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
161+
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
162+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
163+
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
164+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
165+
}
166+
}
167+
168+
complete_apps = ['api']

‎controller/deis/settings.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
"django.core.context_processors.static",
9999
"django.core.context_processors.tz",
100100
"django.contrib.messages.context_processors.messages",
101-
"allauth.account.context_processors.account",
102101
"deis.context_processors.site",
103102
)
104103

@@ -136,8 +135,6 @@
136135
'django.contrib.sites',
137136
'django.contrib.staticfiles',
138137
# Third-party apps
139-
'allauth',
140-
'allauth.account',
141138
'django_fsm',
142139
'guardian',
143140
'json_field',
@@ -150,11 +147,8 @@
150147
)
151148

152149
AUTHENTICATION_BACKENDS = (
153-
# Needed to login by username in Django admin, regardless of `allauth`
154150
"django.contrib.auth.backends.ModelBackend",
155151
"guardian.backends.ObjectPermissionBackend",
156-
# `allauth` specific authentication methods, such as login by e-mail
157-
"allauth.account.auth_backends.AuthenticationBackend",
158152
)
159153

160154
ANONYMOUS_USER_ID = -1

‎controller/deis/urls.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
urlpatterns = patterns(
1919
'',
20-
url(r'^accounts/', include('allauth.urls')),
2120
url(r'^api/', include('api.urls')),
2221
)
2322

‎controller/requirements.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
55
#
66
Django==1.6.7
7-
django-allauth==0.15.0
87
# FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59
98
git+https://github.com/deis/django-fsm@propagate-false
109
django-guardian==1.2.4

‎docs/docs_requirements.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#
1010
celery==3.1.13
1111
Django==1.6.7
12-
django-allauth==0.15.0
1312
# FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59
1413
git+https://github.com/deis/django-fsm@propagate-false
1514
django-guardian==1.2.4

0 commit comments

Comments
 (0)