Merge branch 'master-nomake'

1 files changed, 0 insertions, 93 deletions

diff --git a/mirrors/migrations/0015_assign_country_codes.py b/mirrors/migrations/0015_assign_country_codes.py
deleted file mode 100644
index 5d83e02c..00000000
--- a/mirrors/migrations/0015_assign_country_codes.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-from django_countries.data import COUNTRIES
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        reverse_map = dict((v.upper(), k) for k, v in COUNTRIES.items())
-        # add a few special cases to the list that we know might exist
-        reverse_map['GREAT BRITAIN'] = 'GB'
-        reverse_map['KOREA'] = 'KR'
-        reverse_map['MACEDONIA'] = 'MK'
-        reverse_map['RUSSIA'] = 'RU'
-        reverse_map['SOUTH KOREA'] = 'KR'
-        reverse_map['TAIWAN'] = 'TW'
-        reverse_map['VIETNAM'] = 'VN'
-
-        for country_name in orm.Mirror.objects.values_list(
-                'country_old', flat=True).order_by().distinct():
-            code = reverse_map.get(country_name.upper(), '')
-            orm.Mirror.objects.filter(
-                    country_old=country_name).update(country=code)
-
-        for country_name in orm.MirrorUrl.objects.filter(
-				country_old__isnull=False).values_list(
-                'country_old', flat=True).order_by().distinct():
-            code = reverse_map.get(country_name.upper(), '')
-            orm.MirrorUrl.objects.filter(
-                    country_old=country_name).update(country=code)
-
-    def backwards(self, orm):
-        orm.MirrorUrl.objects.all().update(country='')
-        orm.Mirror.objects.all().update(country='')
-
-    models = {
-        'mirrors.mirror': {
-            'Meta': {'ordering': "('country', 'name')", 'object_name': 'Mirror'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'admin_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
-            'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
-            'country_old': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'isos': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
-            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'rsync_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
-            'rsync_user': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
-            'tier': ('django.db.models.fields.SmallIntegerField', [], {'default': '2'}),
-            'upstream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['mirrors.Mirror']", 'null': 'True', 'on_delete': 'models.SET_NULL'})
-        },
-        'mirrors.mirrorlog': {
-            'Meta': {'object_name': 'MirrorLog'},
-            'check_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
-            'duration': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
-            'error': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_success': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'last_sync': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'url': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'logs'", 'to': "orm['mirrors.MirrorUrl']"})
-        },
-        'mirrors.mirrorprotocol': {
-            'Meta': {'ordering': "('protocol',)", 'object_name': 'MirrorProtocol'},
-            'default': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_download': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'protocol': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '10'})
-        },
-        'mirrors.mirrorrsync': {
-            'Meta': {'object_name': 'MirrorRsync'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'ip': ('django.db.models.fields.CharField', [], {'max_length': '24'}),
-            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rsync_ips'", 'to': "orm['mirrors.Mirror']"})
-        },
-        'mirrors.mirrorurl': {
-            'Meta': {'object_name': 'MirrorUrl'},
-            'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
-            'country_old': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'has_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'has_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'to': "orm['mirrors.Mirror']"}),
-            'protocol': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'on_delete': 'models.PROTECT', 'to': "orm['mirrors.MirrorProtocol']"}),
-            'url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        }
-    }
-
-    complete_apps = ['mirrors']
-    symmetrical = True