-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/test-bench
# Conflicts: # cloudpebble/settings.py # ide/models/files.py
- Loading branch information
Showing
11 changed files
with
198 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
173 changes: 173 additions & 0 deletions
173
ide/south_migrations/0047_remove_pebblejs_dependencies.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from south.utils import datetime_utils as datetime | ||
| from south.db import db | ||
| from south.v2 import DataMigration | ||
| from django.db import models | ||
|
|
||
| class Migration(DataMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| """ Delete all dependencies for pebblejs projects. """ | ||
| orm.Dependency.objects.filter(project__project_type='pebblejs').delete() | ||
|
|
||
| def backwards(self, orm): | ||
| pass | ||
|
|
||
| models = { | ||
| u'auth.group': { | ||
| 'Meta': {'object_name': 'Group'}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
| 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
| }, | ||
| u'auth.permission': { | ||
| 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, | ||
| 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
| }, | ||
| u'auth.user': { | ||
| 'Meta': {'object_name': 'User'}, | ||
| 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
| 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
| 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
| 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
| 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), | ||
| 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
| }, | ||
| u'contenttypes.contenttype': { | ||
| 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
| 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
| }, | ||
| 'ide.buildresult': { | ||
| 'Meta': {'object_name': 'BuildResult'}, | ||
| 'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'builds'", 'to': "orm['ide.Project']"}), | ||
| 'started': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), | ||
| 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
| 'uuid': ('django.db.models.fields.CharField', [], {'default': "'6228d33c-ce42-4649-b7ee-2cb5d075c403'", 'max_length': '36'}) | ||
| }, | ||
| 'ide.buildsize': { | ||
| 'Meta': {'object_name': 'BuildSize'}, | ||
| 'binary_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sizes'", 'to': "orm['ide.BuildResult']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'platform': ('django.db.models.fields.CharField', [], {'max_length': '20'}), | ||
| 'resource_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'total_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'worker_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) | ||
| }, | ||
| 'ide.dependency': { | ||
| 'Meta': {'unique_together': "(('project', 'name'),)", 'object_name': 'Dependency'}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dependencies'", 'to': "orm['ide.Project']"}), | ||
| 'version': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
| }, | ||
| 'ide.project': { | ||
| 'Meta': {'object_name': 'Project'}, | ||
| 'app_capabilities': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'app_company_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
| 'app_is_hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'app_is_shown_on_communication': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'app_is_watchface': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'app_jshint': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'app_keys': ('django.db.models.fields.TextField', [], {'default': "'{}'"}), | ||
| 'app_keywords': ('django.db.models.fields.TextField', [], {'default': "'[]'"}), | ||
| 'app_long_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
| 'app_modern_multi_js': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'app_platforms': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'app_short_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
| 'app_uuid': ('django.db.models.fields.CharField', [], {'default': "'7b46955b-0250-45d8-9347-559273c689d2'", 'max_length': '36', 'null': 'True', 'blank': 'True'}), | ||
| 'app_version_label': ('django.db.models.fields.CharField', [], {'default': "'1.0'", 'max_length': '40', 'null': 'True', 'blank': 'True'}), | ||
| 'github_branch': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
| 'github_hook_build': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'github_hook_uuid': ('django.db.models.fields.CharField', [], {'max_length': '36', 'null': 'True', 'blank': 'True'}), | ||
| 'github_last_commit': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}), | ||
| 'github_last_sync': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'github_repo': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'last_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 'optimisation': ('django.db.models.fields.CharField', [], {'default': "'s'", 'max_length': '1'}), | ||
| 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}), | ||
| 'project_type': ('django.db.models.fields.CharField', [], {'default': "'native'", 'max_length': '10'}), | ||
| 'sdk_version': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '6'}) | ||
| }, | ||
| 'ide.resourcefile': { | ||
| 'Meta': {'unique_together': "(('project', 'file_name'),)", 'object_name': 'ResourceFile'}, | ||
| 'file_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_menu_icon': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'kind': ('django.db.models.fields.CharField', [], {'max_length': '9'}), | ||
| 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'resources'", 'to': "orm['ide.Project']"}) | ||
| }, | ||
| 'ide.resourceidentifier': { | ||
| 'Meta': {'object_name': 'ResourceIdentifier'}, | ||
| 'character_regex': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
| 'compatibility': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'memory_format': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), | ||
| 'resource_file': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'to': "orm['ide.ResourceFile']"}), | ||
| 'resource_id': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'space_optimisation': ('django.db.models.fields.CharField', [], {'max_length': '7', 'null': 'True', 'blank': 'True'}), | ||
| 'storage_format': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}), | ||
| 'target_platforms': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '30', 'null': 'True', 'blank': 'True'}), | ||
| 'tracking': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) | ||
| }, | ||
| 'ide.resourcevariant': { | ||
| 'Meta': {'unique_together': "(('resource_file', 'tags'),)", 'object_name': 'ResourceVariant'}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_legacy': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'resource_file': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'variants'", 'to': "orm['ide.ResourceFile']"}), | ||
| 'tags': ('django.db.models.fields.CommaSeparatedIntegerField', [], {'max_length': '50', 'blank': 'True'}) | ||
| }, | ||
| 'ide.sourcefile': { | ||
| 'Meta': {'unique_together': "(('project', 'file_name'),)", 'object_name': 'SourceFile'}, | ||
| 'file_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'folded_lines': ('django.db.models.fields.TextField', [], {'default': "'[]'"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'last_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), | ||
| 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source_files'", 'to': "orm['ide.Project']"}), | ||
| 'target': ('django.db.models.fields.CharField', [], {'default': "'app'", 'max_length': '10'}) | ||
| }, | ||
| 'ide.templateproject': { | ||
| 'Meta': {'object_name': 'TemplateProject', '_ormbases': ['ide.Project']}, | ||
| u'project_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['ide.Project']", 'unique': 'True', 'primary_key': 'True'}), | ||
| 'template_kind': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}) | ||
| }, | ||
| 'ide.usergithub': { | ||
| 'Meta': {'object_name': 'UserGithub'}, | ||
| 'avatar': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'nonce': ('django.db.models.fields.CharField', [], {'max_length': '36', 'null': 'True', 'blank': 'True'}), | ||
| 'token': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
| 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'github'", 'unique': 'True', 'primary_key': 'True', 'to': u"orm['auth.User']"}), | ||
| 'username': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
| }, | ||
| 'ide.usersettings': { | ||
| 'Meta': {'object_name': 'UserSettings'}, | ||
| 'accepted_terms': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'autocomplete': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
| 'keybinds': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '20'}), | ||
| 'tab_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '2'}), | ||
| 'theme': ('django.db.models.fields.CharField', [], {'default': "'cloudpebble'", 'max_length': '50'}), | ||
| 'use_spaces': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}), | ||
| 'whats_new': ('django.db.models.fields.PositiveIntegerField', [], {'default': '22'}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['ide'] | ||
| symmetrical = True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.