diff --git a/network/base/migrations/0001_initial.py b/network/base/migrations/0001_initial.py index 20700b8..27780d3 100644 --- a/network/base/migrations/0001_initial.py +++ b/network/base/migrations/0001_initial.py @@ -20,8 +20,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('frequency', models.FloatField(validators=[django.core.validators.MinValueValidator(0)])), - ('band', models.CharField(max_length=5, choices=[(b'HF', b'HF'), (b'VHF', b'VHF'), (b'UHF', b'UHF'), (b'L', b'L'), (b'S', b'S'), (b'C', b'C'), (b'X', b'X'), (b'KU', b'KU')])), - ('antenna_type', models.CharField(max_length=15, choices=[(b'dipole', b'Dipole'), (b'yagi', b'Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic')])), + ('band', models.CharField(max_length=5, choices=[('HF', 'HF'), ('VHF', 'VHF'), ('UHF', 'UHF'), ('L', 'L'), ('S', 'S'), ('C', 'C'), ('X', 'X'), ('KU', 'KU')])), + ('antenna_type', models.CharField(max_length=15, choices=[('dipole', 'Dipole'), ('yagi', 'Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic')])), ], ), migrations.CreateModel( @@ -30,7 +30,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('start', models.DateTimeField()), ('end', models.DateTimeField()), - ('payload', models.FileField(null=True, upload_to=b'data_payloads', blank=True)), + ('payload', models.FileField(null=True, upload_to='data_payloads', blank=True)), ], options={ 'ordering': ['-start', '-end'], @@ -62,7 +62,7 @@ class Migration(migrations.Migration): ('norad_cat_id', models.PositiveIntegerField()), ('name', models.CharField(max_length=45)), ('names', models.TextField(blank=True)), - ('image', models.ImageField(upload_to=b'satellites', blank=True)), + ('image', models.ImageField(upload_to='satellites', blank=True)), ('tle0', models.CharField(max_length=100, blank=True)), ('tle1', models.CharField(max_length=200, blank=True)), ('tle2', models.CharField(max_length=200, blank=True)), @@ -77,8 +77,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(max_length=45)), - ('image', models.ImageField(upload_to=b'ground_stations', blank=True)), - ('alt', models.PositiveIntegerField(help_text=b'In meters above ground')), + ('image', models.ImageField(upload_to='ground_stations', blank=True)), + ('alt', models.PositiveIntegerField(help_text='In meters above ground')), ('lat', models.FloatField(validators=[django.core.validators.MaxValueValidator(90), django.core.validators.MinValueValidator(-90)])), ('lng', models.FloatField(validators=[django.core.validators.MaxValueValidator(180), django.core.validators.MinValueValidator(-180)])), ('qthlocator', models.CharField(max_length=255, blank=True)), @@ -87,7 +87,7 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('active', models.BooleanField(default=False)), ('last_seen', models.DateTimeField(null=True, blank=True)), - ('antenna', models.ManyToManyField(help_text=b'If you want to add a new Antenna contact SatNOGS Team', to='base.Antenna', blank=True)), + ('antenna', models.ManyToManyField(help_text='If you want to add a new Antenna contact SatNOGS Team', to='base.Antenna', blank=True)), ('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)), ], options={ diff --git a/network/base/migrations/0002_auto_20151011_1406.py b/network/base/migrations/0002_auto_20151011_1406.py index 61afef8..f5dc1b6 100644 --- a/network/base/migrations/0002_auto_20151011_1406.py +++ b/network/base/migrations/0002_auto_20151011_1406.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(max_length=15, choices=[(b'dipole', b'Dipole'), (b'yagi', b'Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Verical')]), + field=models.CharField(max_length=15, choices=[('dipole', 'Dipole'), ('yagi', 'Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Verical')]), ), ] diff --git a/network/base/migrations/0004_station_horizon.py b/network/base/migrations/0004_station_horizon.py index e8772f7..863f2d5 100644 --- a/network/base/migrations/0004_station_horizon.py +++ b/network/base/migrations/0004_station_horizon.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='station', name='horizon', - field=models.PositiveIntegerField(default=10, help_text=b'In degrees above 0'), + field=models.PositiveIntegerField(default=10, help_text='In degrees above 0'), ), ] diff --git a/network/base/migrations/0005_auto_20160320_1619.py b/network/base/migrations/0005_auto_20160320_1619.py index bc23d6a..d17576d 100644 --- a/network/base/migrations/0005_auto_20160320_1619.py +++ b/network/base/migrations/0005_auto_20160320_1619.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): name='Rig', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(choices=[(b'Radio', b'Radio'), (b'SDR', b'SDR')], max_length=10)), + ('name', models.CharField(choices=[('Radio', 'Radio'), ('SDR', 'SDR')], max_length=10)), ('rictld_number', models.PositiveIntegerField(blank=True, null=True)), ], ), diff --git a/network/base/migrations/0006_auto_20160325_0126.py b/network/base/migrations/0006_auto_20160325_0126.py index a1f486e..3312b2b 100644 --- a/network/base/migrations/0006_auto_20160325_0126.py +++ b/network/base/migrations/0006_auto_20160325_0126.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='data', name='vetted_status', - field=models.CharField(choices=[(b'unknown', b'Unknown'), (b'verified', b'Verified'), (b'data_not_verified', b'Has Data, Not Verified'), (b'no_data', b'No Data')], default=b'unknown', max_length=10), + field=models.CharField(choices=[('unknown', 'Unknown'), ('verified', 'Verified'), ('data_not_verified', 'Has Data, Not Verified'), ('no_data', b'No Data')], default='unknown', max_length=10), ), migrations.AddField( model_name='data', diff --git a/network/base/migrations/0007_data_payload_demode.py b/network/base/migrations/0007_data_payload_demode.py index 2d83d6e..feb3dd5 100644 --- a/network/base/migrations/0007_data_payload_demode.py +++ b/network/base/migrations/0007_data_payload_demode.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='data', name='payload_demode', - field=models.FileField(blank=True, null=True, upload_to=b'data_payloads'), + field=models.FileField(blank=True, null=True, upload_to='data_payloads'), ), ] diff --git a/network/base/migrations/0010_auto_20160507_1550.py b/network/base/migrations/0010_auto_20160507_1550.py index de40418..e3b88d6 100644 --- a/network/base/migrations/0010_auto_20160507_1550.py +++ b/network/base/migrations/0010_auto_20160507_1550.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): name='DemodData', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('payload_demod', models.FileField(blank=True, null=True, upload_to=b'data_payloads')), + ('payload_demod', models.FileField(blank=True, null=True, upload_to='data_payloads')), ], ), migrations.RemoveField( diff --git a/network/base/migrations/0012_auto_20160508_1516.py b/network/base/migrations/0012_auto_20160508_1516.py index afccec9..b31d0a3 100644 --- a/network/base/migrations/0012_auto_20160508_1516.py +++ b/network/base/migrations/0012_auto_20160508_1516.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='station', name='antenna', - field=models.ManyToManyField(blank=True, help_text=b'If you want to add a new Antenna contact SatNOGS Team', to='base.Antenna'), + field=models.ManyToManyField(blank=True, help_text='If you want to add a new Antenna contact SatNOGS Team', to='base.Antenna'), ), ] diff --git a/network/base/migrations/0013_data_waterfall.py b/network/base/migrations/0013_data_waterfall.py index f203f14..ac10f1d 100644 --- a/network/base/migrations/0013_data_waterfall.py +++ b/network/base/migrations/0013_data_waterfall.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='data', name='waterfall', - field=models.ImageField(blank=True, null=True, upload_to=b'data_waterfalls'), + field=models.ImageField(blank=True, null=True, upload_to='data_waterfalls'), ), ] diff --git a/network/base/migrations/0014_auto_20170205_0059.py b/network/base/migrations/0014_auto_20170205_0059.py index 17b0b60..22452fb 100644 --- a/network/base/migrations/0014_auto_20170205_0059.py +++ b/network/base/migrations/0014_auto_20170205_0059.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='data', name='vetted_status', - field=models.CharField(choices=[(b'unknown', b'Unknown'), (b'verified', b'Verified'), (b'data_not_verified', b'Has Data, Not Verified'), (b'no_data', b'No Data')], default=b'unknown', max_length=20), + field=models.CharField(choices=[('unknown', 'Unknown'), ('verified', 'Verified'), ('data_not_verified', 'Has Data, Not Verified'), ('no_data', b'No Data')], default='unknown', max_length=20), ), ] diff --git a/network/base/migrations/0018_auto_20170519_1955.py b/network/base/migrations/0018_auto_20170519_1955.py index 011f317..4139748 100644 --- a/network/base/migrations/0018_auto_20170519_1955.py +++ b/network/base/migrations/0018_auto_20170519_1955.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(choices=[(b'dipole', b'Dipole'), (b'yagi', b'Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Verical'), (b'turnstile', b'Turnstile'), (b'quadrafilar', b'Quadrafilar'), (b'eggbeater', b'Eggbeater'), (b'lindenblad', b'Lindenblad')], max_length=15), + field=models.CharField(choices=[('dipole', 'Dipole'), ('yagi', 'Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Verical'), ('turnstile', 'Turnstile'), ('quadrafilar', 'Quadrafilar'), ('eggbeater', 'Eggbeater'), ('lindenblad', 'Lindenblad')], max_length=15), ), ] diff --git a/network/base/migrations/0019_satellite_status.py b/network/base/migrations/0019_satellite_status.py index db0e47e..fa4f2a9 100644 --- a/network/base/migrations/0019_satellite_status.py +++ b/network/base/migrations/0019_satellite_status.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='satellite', name='status', - field=models.CharField(choices=[(b'alive', b'alive'), (b'dead', b'dead'), (b're-entered', b're-entered')], default=b'alive', max_length=10), + field=models.CharField(choices=[('alive', 'alive'), ('dead', 'dead'), ('re-entered', 're-entered')], default='alive', max_length=10), ), ] diff --git a/network/base/migrations/0022_auto_20170909_2103.py b/network/base/migrations/0022_auto_20170909_2103.py index 2fef195..b6427a3 100644 --- a/network/base/migrations/0022_auto_20170909_2103.py +++ b/network/base/migrations/0022_auto_20170909_2103.py @@ -43,7 +43,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='observation', name='payload', - field=models.FileField(blank=True, null=True, upload_to=b'data_payloads'), + field=models.FileField(blank=True, null=True, upload_to='data_payloads'), ), migrations.AddField( model_name='observation', @@ -63,7 +63,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='observation', name='vetted_status', - field=models.CharField(choices=[(b'unknown', b'Unknown'), (b'verified', b'Verified'), (b'data_not_verified', b'Has Data, Not Verified'), (b'no_data', b'No Data')], default=b'unknown', max_length=20), + field=models.CharField(choices=[('unknown', 'Unknown'), ('verified', 'Verified'), ('data_not_verified', 'Has Data, Not Verified'), ('no_data', b'No Data')], default='unknown', max_length=20), ), migrations.AddField( model_name='observation', @@ -73,6 +73,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='observation', name='waterfall', - field=models.ImageField(blank=True, null=True, upload_to=b'data_waterfalls'), + field=models.ImageField(blank=True, null=True, upload_to='data_waterfalls'), ), ] diff --git a/network/base/migrations/0028_auto_20171127_2154.py b/network/base/migrations/0028_auto_20171127_2154.py index 2ca29d3..5eb6f07 100644 --- a/network/base/migrations/0028_auto_20171127_2154.py +++ b/network/base/migrations/0028_auto_20171127_2154.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(choices=[(b'dipole', b'Dipole'), (b'yagi', b'Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Verical'), (b'turnstile', b'Turnstile'), (b'quadrafilar', b'Quadrafilar'), (b'eggbeater', b'Eggbeater'), (b'lindenblad', b'Lindenblad'), (b'paralindy', b'Parasitic Lindenblad')], max_length=15), + field=models.CharField(choices=[('dipole', 'Dipole'), ('yagi', 'Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Verical'), ('turnstile', 'Turnstile'), ('quadrafilar', 'Quadrafilar'), ('eggbeater', 'Eggbeater'), ('lindenblad', 'Lindenblad'), ('paralindy', 'Parasitic Lindenblad')], max_length=15), ), ] diff --git a/network/base/migrations/0030_auto_20171224_1701.py b/network/base/migrations/0030_auto_20171224_1701.py index 6a15478..e3c2af9 100644 --- a/network/base/migrations/0030_auto_20171224_1701.py +++ b/network/base/migrations/0030_auto_20171224_1701.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='observation', name='vetted_status', - field=models.CharField(choices=[(b'unknown', b'Unknown'), (b'verified', b'Verified'), (b'no_data', b'No Data'), (b'good', b'Good'), (b'bad', b'Bad'), (b'failed', b'Failed')], default=b'unknown', max_length=20), + field=models.CharField(choices=[('unknown', 'Unknown'), ('verified', 'Verified'), ('no_data', 'No Data'), ('good', 'Good'), ('bad', 'Bad'), ('failed', 'Failed')], default='unknown', max_length=20), ), ] diff --git a/network/base/migrations/0032_auto_20171224_1703.py b/network/base/migrations/0032_auto_20171224_1703.py index 06d6333..2b95e9f 100644 --- a/network/base/migrations/0032_auto_20171224_1703.py +++ b/network/base/migrations/0032_auto_20171224_1703.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='observation', name='vetted_status', - field=models.CharField(choices=[(b'unknown', b'Unknown'), (b'good', b'Good'), (b'bad', b'Bad'), (b'failed', b'Failed')], default=b'unknown', max_length=20), + field=models.CharField(choices=[('unknown', 'Unknown'), ('good', 'Good'), ('bad', 'Bad'), ('failed', 'Failed')], default='unknown', max_length=20), ), ] diff --git a/network/base/migrations/0033_auto_20171228_1515.py b/network/base/migrations/0033_auto_20171228_1515.py index 32f5008..c059291 100644 --- a/network/base/migrations/0033_auto_20171228_1515.py +++ b/network/base/migrations/0033_auto_20171228_1515.py @@ -28,7 +28,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='station', name='status', - field=models.IntegerField(choices=[(2, b'Online'), (1, b'Testing'), (0, b'Offline')], default=0), + field=models.IntegerField(choices=[(2, 'Online'), (1, 'Testing'), (0, 'Offline')], default=0), ), migrations.AddField( model_name='station', diff --git a/network/base/migrations/0036_auto_20180316_1216.py b/network/base/migrations/0036_auto_20180316_1216.py index 2a22230..f390b75 100644 --- a/network/base/migrations/0036_auto_20180316_1216.py +++ b/network/base/migrations/0036_auto_20180316_1216.py @@ -16,16 +16,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='station', name='description', - field=models.TextField(blank=True, help_text=b'Max 500 characters', max_length=500), + field=models.TextField(blank=True, help_text='Max 500 characters', max_length=500), ), migrations.AlterField( model_name='station', name='lat', - field=models.FloatField(help_text=b'eg. 38.01697', validators=[django.core.validators.MaxValueValidator(90), django.core.validators.MinValueValidator(-90)]), + field=models.FloatField(help_text='eg. 38.01697', validators=[django.core.validators.MaxValueValidator(90), django.core.validators.MinValueValidator(-90)]), ), migrations.AlterField( model_name='station', name='lng', - field=models.FloatField(help_text=b'eg. 23.7314', validators=[django.core.validators.MaxValueValidator(180), django.core.validators.MinValueValidator(-180)]), + field=models.FloatField(help_text='eg. 23.7314', validators=[django.core.validators.MaxValueValidator(180), django.core.validators.MinValueValidator(-180)]), ), ] diff --git a/network/base/migrations/0037_stationstatuslog.py b/network/base/migrations/0037_stationstatuslog.py index 8e1f97c..a4e9c6f 100644 --- a/network/base/migrations/0037_stationstatuslog.py +++ b/network/base/migrations/0037_stationstatuslog.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): name='StationStatusLog', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('status', models.IntegerField(choices=[(2, b'Online'), (1, b'Testing'), (0, b'Offline')], default=0)), + ('status', models.IntegerField(choices=[(2, 'Online'), (1, 'Testing'), (0, 'Offline')], default=0)), ('changed', models.DateTimeField(auto_now_add=True)), ('station', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='station_logs', to='base.Station')), ], diff --git a/network/base/migrations/0040_auto_20180811_1350.py b/network/base/migrations/0040_auto_20180811_1350.py index 765a9fd..c8750b2 100644 --- a/network/base/migrations/0040_auto_20180811_1350.py +++ b/network/base/migrations/0040_auto_20180811_1350.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='station', name='alt', - field=models.PositiveIntegerField(help_text=b'In meters above sea level'), + field=models.PositiveIntegerField(help_text='In meters above sea level'), ), ] diff --git a/network/base/migrations/0041_auto_20180812_0915.py b/network/base/migrations/0041_auto_20180812_0915.py index 683248a..6959f36 100644 --- a/network/base/migrations/0041_auto_20180812_0915.py +++ b/network/base/migrations/0041_auto_20180812_0915.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(choices=[(b'dipole', b'Dipole'), (b'v-dipole', b'V-Dipole'), (b'yagi', b'Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Verical'), (b'turnstile', b'Turnstile'), (b'quadrafilar', b'Quadrafilar'), (b'eggbeater', b'Eggbeater'), (b'lindenblad', b'Lindenblad'), (b'paralindy', b'Parasitic Lindenblad')], max_length=15), + field=models.CharField(choices=[('dipole', 'Dipole'), ('v-dipole', 'V-Dipole'), ('yagi', 'Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Verical'), ('turnstile', 'Turnstile'), ('quadrafilar', 'Quadrafilar'), ('eggbeater', 'Eggbeater'), ('lindenblad', 'Lindenblad'), ('paralindy', 'Parasitic Lindenblad')], max_length=15), ), ] diff --git a/network/base/migrations/0042_auto_20180814_1325.py b/network/base/migrations/0042_auto_20180814_1325.py index fd35944..ef2eb13 100644 --- a/network/base/migrations/0042_auto_20180814_1325.py +++ b/network/base/migrations/0042_auto_20180814_1325.py @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='station', name='image', - field=models.ImageField(blank=True, upload_to=b'ground_stations', validators=[network.base.models.validate_image]), + field=models.ImageField(blank=True, upload_to='ground_stations', validators=[network.base.models.validate_image]), ), ] diff --git a/network/base/migrations/0043_auto_20180817_0923.py b/network/base/migrations/0043_auto_20180817_0923.py index 12c3147..f39fcfd 100644 --- a/network/base/migrations/0043_auto_20180817_0923.py +++ b/network/base/migrations/0043_auto_20180817_0923.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='station', name='antenna', - field=models.ManyToManyField(blank=True, help_text=b'If you want to add a new Antenna contact SatNOGS Team', related_name='stations', to='base.Antenna'), + field=models.ManyToManyField(blank=True, help_text='If you want to add a new Antenna contact SatNOGS Team', related_name='stations', to='base.Antenna'), ), ] diff --git a/network/base/migrations/0044_auto_20180817_1351.py b/network/base/migrations/0044_auto_20180817_1351.py index aec8a1b..5e8cffb 100644 --- a/network/base/migrations/0044_auto_20180817_1351.py +++ b/network/base/migrations/0044_auto_20180817_1351.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(choices=[(b'dipole', b'Dipole'), (b'v-dipole', b'V-Dipole'), (b'discone', b'Discone'), (b'yagi', b'Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Verical'), (b'turnstile', b'Turnstile'), (b'quadrafilar', b'Quadrafilar'), (b'eggbeater', b'Eggbeater'), (b'lindenblad', b'Lindenblad'), (b'paralindy', b'Parasitic Lindenblad')], max_length=15), + field=models.CharField(choices=[('dipole', 'Dipole'), ('v-dipole', 'V-Dipole'), ('discone', 'Discone'), ('yagi', 'Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Verical'), ('turnstile', 'Turnstile'), ('quadrafilar', 'Quadrafilar'), ('eggbeater', 'Eggbeater'), ('lindenblad', 'Lindenblad'), ('paralindy', 'Parasitic Lindenblad')], max_length=15), ), ] diff --git a/network/base/migrations/0045_auto_20180822_1947.py b/network/base/migrations/0045_auto_20180822_1947.py index 1a9abb9..b67b2ad 100644 --- a/network/base/migrations/0045_auto_20180822_1947.py +++ b/network/base/migrations/0045_auto_20180822_1947.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(choices=[(b'dipole', b'Dipole'), (b'v-dipole', b'V-Dipole'), (b'discone', b'Discone'), (b'ground', b'Ground Plane'), (b'yagi', b'Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Verical'), (b'turnstile', b'Turnstile'), (b'quadrafilar', b'Quadrafilar'), (b'eggbeater', b'Eggbeater'), (b'lindenblad', b'Lindenblad'), (b'paralindy', b'Parasitic Lindenblad')], max_length=15), + field=models.CharField(choices=[('dipole', 'Dipole'), ('v-dipole', 'V-Dipole'), ('discone', 'Discone'), ('ground', 'Ground Plane'), ('yagi', 'Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Verical'), ('turnstile', 'Turnstile'), ('quadrafilar', 'Quadrafilar'), ('eggbeater', 'Eggbeater'), ('lindenblad', 'Lindenblad'), ('paralindy', b'Parasitic Lindenblad')], max_length=15), ), ] diff --git a/network/base/migrations/0049_auto_20180915_1503.py b/network/base/migrations/0049_auto_20180915_1503.py index 7304463..be10482 100644 --- a/network/base/migrations/0049_auto_20180915_1503.py +++ b/network/base/migrations/0049_auto_20180915_1503.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(choices=[(b'dipole', b'Dipole'), (b'v-dipole', b'V-Dipole'), (b'discone', b'Discone'), (b'ground', b'Ground Plane'), (b'yagi', b'Yagi'), (b'cross-yagi', b'Cross Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Verical'), (b'turnstile', b'Turnstile'), (b'quadrafilar', b'Quadrafilar'), (b'eggbeater', b'Eggbeater'), (b'lindenblad', b'Lindenblad'), (b'paralindy', b'Parasitic Lindenblad')], max_length=15), + field=models.CharField(choices=[('dipole', 'Dipole'), ('v-dipole', 'V-Dipole'), ('discone', 'Discone'), ('ground', 'Ground Plane'), ('yagi', 'Yagi'), ('cross-yagi', b'Cross Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Verical'), ('turnstile', 'Turnstile'), ('quadrafilar', 'Quadrafilar'), ('eggbeater', 'Eggbeater'), ('lindenblad', 'Lindenblad'), ('paralindy', b'Parasitic Lindenblad')], max_length=15), ), ] diff --git a/network/base/migrations/0052_auto_20181230_2113.py b/network/base/migrations/0052_auto_20181230_2113.py index 89adad5..0fc9c2b 100644 --- a/network/base/migrations/0052_auto_20181230_2113.py +++ b/network/base/migrations/0052_auto_20181230_2113.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='transmitter', name='type', - field=models.CharField(choices=[(b'Transmitter', b'Transmitter'), (b'Transceiver', b'Transceiver'), (b'Transponder', b'Transponder')], default=b'Transmitter', max_length=11), + field=models.CharField(choices=[('Transmitter', 'Transmitter'), ('Transceiver', 'Transceiver'), ('Transponder', 'Transponder')], default='Transmitter', max_length=11), ), migrations.AddField( model_name='transmitter', diff --git a/network/base/migrations/0054_station_target_utilization.py b/network/base/migrations/0054_station_target_utilization.py index 4e4a30a..2408221 100644 --- a/network/base/migrations/0054_station_target_utilization.py +++ b/network/base/migrations/0054_station_target_utilization.py @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='station', name='target_utilization', - field=models.IntegerField(blank=True, help_text=b'Target utilization factor for your station', null=True, validators=[django.core.validators.MaxValueValidator(100), django.core.validators.MinValueValidator(0)]), + field=models.IntegerField(blank=True, help_text='Target utilization factor for your station', null=True, validators=[django.core.validators.MaxValueValidator(100), django.core.validators.MinValueValidator(0)]), ), ] diff --git a/network/base/migrations/0055_add_new_antenna_type.py b/network/base/migrations/0055_add_new_antenna_type.py index 4220e19..40b3ebe 100644 --- a/network/base/migrations/0055_add_new_antenna_type.py +++ b/network/base/migrations/0055_add_new_antenna_type.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='antenna', name='antenna_type', - field=models.CharField(choices=[(b'dipole', b'Dipole'), (b'v-dipole', b'V-Dipole'), (b'discone', b'Discone'), (b'ground', b'Ground Plane'), (b'yagi', b'Yagi'), (b'cross-yagi', b'Cross Yagi'), (b'helical', b'Helical'), (b'parabolic', b'Parabolic'), (b'vertical', b'Vertical'), (b'turnstile', b'Turnstile'), (b'quadrafilar', b'Quadrafilar'), (b'eggbeater', b'Eggbeater'), (b'lindenblad', b'Lindenblad'), (b'paralindy', b'Parasitic Lindenblad'), (b'patch', b'Patch')], max_length=15), + field=models.CharField(choices=[('dipole', 'Dipole'), ('v-dipole', 'V-Dipole'), ('discone', 'Discone'), ('ground', 'Ground Plane'), ('yagi', 'Yagi'), ('cross-yagi', b'Cross Yagi'), ('helical', 'Helical'), ('parabolic', 'Parabolic'), ('vertical', 'Vertical'), ('turnstile', 'Turnstile'), ('quadrafilar', 'Quadrafilar'), ('eggbeater', 'Eggbeater'), ('lindenblad', 'Lindenblad'), ('paralindy', b'Parasitic Lindenblad'), ('patch', 'Patch')], max_length=15), ), ] diff --git a/network/base/migrations/0058_add_transmitter_into_observation_model.py b/network/base/migrations/0058_add_transmitter_into_observation_model.py index 7a3e975..969f603 100644 --- a/network/base/migrations/0058_add_transmitter_into_observation_model.py +++ b/network/base/migrations/0058_add_transmitter_into_observation_model.py @@ -49,7 +49,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='observation', name='transmitter_description', - field=models.TextField(default=b''), + field=models.TextField(default=''), ), migrations.AddField( model_name='observation', @@ -79,7 +79,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='observation', name='transmitter_type', - field=models.CharField(choices=[(b'Transmitter', b'Transmitter'), (b'Transceiver', b'Transceiver'), (b'Transponder', b'Transponder')], default=b'Transmitter', max_length=11), + field=models.CharField(choices=[('Transmitter', 'Transmitter'), ('Transceiver', 'Transceiver'), ('Transponder', 'Transponder')], default='Transmitter', max_length=11), ), migrations.AddField( model_name='observation', diff --git a/network/base/migrations/0061_create_indexes.py b/network/base/migrations/0061_create_indexes.py index 9b3b446..1dd6ad9 100644 --- a/network/base/migrations/0061_create_indexes.py +++ b/network/base/migrations/0061_create_indexes.py @@ -34,14 +34,14 @@ class Migration(migrations.Migration): ), migrations.AddIndex( model_name='observation', - index=models.Index(fields=[b'-start', b'-end'], name='base_observ_start_bbb297_idx'), + index=models.Index(fields=['-start', '-end'], name='base_observ_start_bbb297_idx'), ), migrations.AddIndex( model_name='stationstatuslog', - index=models.Index(fields=[b'-changed'], name='base_statio_changed_71df65_idx'), + index=models.Index(fields=['-changed'], name='base_statio_changed_71df65_idx'), ), migrations.AddIndex( model_name='station', - index=models.Index(fields=[b'-status', b'id'], name='base_statio_status_797b1c_idx'), + index=models.Index(fields=['-status', 'id'], name='base_statio_status_797b1c_idx'), ), ] diff --git a/network/users/migrations/0001_squashed_0002_auto_20150415_1141.py b/network/users/migrations/0001_squashed_0002_auto_20150415_1141.py index 8344848..562606a 100644 --- a/network/users/migrations/0001_squashed_0002_auto_20150415_1141.py +++ b/network/users/migrations/0001_squashed_0002_auto_20150415_1141.py @@ -28,9 +28,9 @@ class Migration(migrations.Migration): ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('bio', models.TextField(default=b'', validators=[django.core.validators.MaxLengthValidator(1000)])), - ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to=b'auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups')), - ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to=b'auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')), + ('bio', models.TextField(default='', validators=[django.core.validators.MaxLengthValidator(1000)])), + ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')), ], options={ 'abstract': False, @@ -41,7 +41,7 @@ class Migration(migrations.Migration): migrations.AlterModelManagers( name='user', managers=[ - (b'objects', django.contrib.auth.models.UserManager()), + ('objects', django.contrib.auth.models.UserManager()), ], ), migrations.AlterField( @@ -52,7 +52,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='user', name='groups', - field=models.ManyToManyField(related_query_name='user', related_name='user_set', to=b'auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'), + field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'), ), migrations.AlterField( model_name='user',