Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove jsonfield dependency #2283

Closed
wants to merge 1 commit into from
Closed

Remove jsonfield dependency #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dashboard/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import jsonfield.fields
from django.contrib.postgres.fields import JSONField


class Migration(migrations.Migration):
Expand All @@ -22,7 +22,7 @@ class Migration(migrations.Migration):
name='CachedCertificate',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('data', jsonfield.fields.JSONField(null=True)),
('data', JSONField(null=True)),
('last_request', models.DateTimeField()),
('course_run', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.CourseRun')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
Expand All @@ -32,7 +32,7 @@ class Migration(migrations.Migration):
name='CachedEnrollment',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('data', jsonfield.fields.JSONField(null=True)),
('data', JSONField(null=True)),
('last_request', models.DateTimeField()),
('course_run', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.CourseRun')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
Expand Down
4 changes: 2 additions & 2 deletions dashboard/migrations/0003_current_grade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import jsonfield.fields
from django.contrib.postgres.fields import JSONField


class Migration(migrations.Migration):
Expand All @@ -21,7 +21,7 @@ class Migration(migrations.Migration):
name='CachedCurrentGrade',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('data', jsonfield.fields.JSONField(null=True)),
('data', JSONField(null=True)),
('last_request', models.DateTimeField()),
('course_run', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.CourseRun')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
Expand Down
4 changes: 2 additions & 2 deletions ecommerce/migrations/0004_create_receipt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from django.db import migrations, models
import django.db.models.deletion
import jsonfield.fields
from django.contrib.postgres.fields import JSONField


class Migration(migrations.Migration):
Expand All @@ -18,7 +18,7 @@ class Migration(migrations.Migration):
name='Receipt',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('data', jsonfield.fields.JSONField()),
('data', JSONField()),
('created_at', models.DateTimeField(auto_now_add=True)),
('modified_at', models.DateTimeField(auto_now=True)),
],
Expand Down
6 changes: 3 additions & 3 deletions financialaid/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import jsonfield.fields
from django.contrib.postgres.fields import JSONField


class Migration(migrations.Migration):
Expand Down Expand Up @@ -55,8 +55,8 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('table_changed', models.CharField(max_length=50)),
('data_before', jsonfield.fields.JSONField(blank=True)),
('data_after', jsonfield.fields.JSONField(blank=True)),
('data_before', JSONField(blank=True)),
('data_after', JSONField(blank=True)),
('date', models.DateTimeField()),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
Expand Down
4 changes: 2 additions & 2 deletions profiles/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import jsonfield.fields
from django.contrib.postgres.fields import JSONField


class Migration(migrations.Migration):
Expand Down Expand Up @@ -38,7 +38,7 @@ class Migration(migrations.Migration):
('year_of_birth', models.IntegerField(blank=True, null=True)),
('level_of_education', models.TextField(blank=True, choices=[('p', 'Doctorate'), ('m', "Master's or professional degree"), ('b', "Bachelor's degree"), ('a', 'Associate degree'), ('hs', 'High school'), ('jhs', 'Junior high school'), ('el', 'Elementary school'), ('none', 'No formal education'), ('other', 'Other education')], max_length=6, null=True)),
('goals', models.TextField(blank=True, null=True)),
('language_proficiencies', jsonfield.fields.JSONField(blank=True, null=True)),
('language_proficiencies', JSONField(blank=True, null=True)),
('gender', models.CharField(blank=True, choices=[('m', 'Male'), ('f', 'Female'), ('o', 'Other/Prefer Not to Say')], max_length=6, null=True)),
('mailing_address', models.TextField(blank=True, null=True)),
('date_joined', models.DateTimeField(blank=True, null=True)),
Expand Down
4 changes: 2 additions & 2 deletions profiles/migrations/0004_profile_linkedin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from __future__ import unicode_literals

from django.db import migrations
import jsonfield.fields
from django.contrib.postgres.fields import JSONField


class Migration(migrations.Migration):
Expand All @@ -16,6 +16,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='profile',
name='linkedin',
field=jsonfield.fields.JSONField(blank=True, null=True),
field=JSONField(blank=True, null=True),
),
]
1 change: 0 additions & 1 deletion requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ elasticsearch==2.3.0
factory_boy
faker
html5lib==0.999999
jsonfield==1.0.3
newrelic
psycopg2==2.6
pycountry==16.11.27.1
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ factory-boy==2.8.1
faker==0.7.3
html5lib==0.999999
idna==2.1 # via cryptography
jsonfield==1.0.3
kombu==3.0.37 # via celery, django-server-status
newrelic==2.72.1.53
oauthlib==2.0.0 # via python-social-auth, requests-oauthlib
Expand Down