From 87496b3929f843d9422750f100d734e1ed571a8e Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sat, 18 May 2019 13:05:03 +0200
Subject: [PATCH] Django 2.1.8 upgrade
---
.../migrations/0005_auto_20190518_1304.py | 19 ++++++++
commentaries/models.py | 2 +-
funders/migrations/0013_auto_20190518_1304.py | 17 +++++++
.../migrations/0064_auto_20190518_1304.py | 45 +++++++++++++++++++
journals/models.py | 6 +--
.../migrations/0011_auto_20190518_1304.py | 24 ++++++++++
organizations/models.py | 4 +-
.../migrations/0023_auto_20190518_1304.py | 21 +++++++++
requirements.txt | 2 +-
scipost/migrations/0025_auto_20190518_1304.py | 17 +++++++
submissions/admin.py | 25 +++++++++--
.../migrations/0056_auto_20190518_1157.py | 18 ++++++++
.../migrations/0057_auto_20190518_1304.py | 23 ++++++++++
submissions/models.py | 3 +-
14 files changed, 213 insertions(+), 13 deletions(-)
create mode 100644 commentaries/migrations/0005_auto_20190518_1304.py
create mode 100644 funders/migrations/0013_auto_20190518_1304.py
create mode 100644 journals/migrations/0064_auto_20190518_1304.py
create mode 100644 organizations/migrations/0011_auto_20190518_1304.py
create mode 100644 profiles/migrations/0023_auto_20190518_1304.py
create mode 100644 scipost/migrations/0025_auto_20190518_1304.py
create mode 100644 submissions/migrations/0056_auto_20190518_1157.py
create mode 100644 submissions/migrations/0057_auto_20190518_1304.py
diff --git a/commentaries/migrations/0005_auto_20190518_1304.py b/commentaries/migrations/0005_auto_20190518_1304.py
new file mode 100644
index 000000000..4aefdd9be
--- /dev/null
+++ b/commentaries/migrations/0005_auto_20190518_1304.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.1.8 on 2019-05-18 11:04
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('commentaries', '0004_auto_20190511_1141'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='commentary',
+ name='metadata',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True),
+ ),
+ ]
diff --git a/commentaries/models.py b/commentaries/models.py
index 5fa79e5e0..b64ec5930 100644
--- a/commentaries/models.py
+++ b/commentaries/models.py
@@ -43,7 +43,7 @@ class Commentary(TimeStampedModel):
pub_DOI_link = models.URLField(
verbose_name='DOI link to the original publication',
blank=True)
- metadata = JSONField(default={}, blank=True, null=True)
+ metadata = JSONField(default=dict, blank=True, null=True)
arxiv_or_DOI_string = models.CharField(max_length=100,
verbose_name='string form of arxiv nr or'
' DOI for commentary url')
diff --git a/funders/migrations/0013_auto_20190518_1304.py b/funders/migrations/0013_auto_20190518_1304.py
new file mode 100644
index 000000000..097af1f90
--- /dev/null
+++ b/funders/migrations/0013_auto_20190518_1304.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.1.8 on 2019-05-18 11:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('funders', '0012_auto_20180922_1609'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='grant',
+ options={'default_related_name': 'grants', 'ordering': ['funder', 'recipient', 'recipient_name', 'number']},
+ ),
+ ]
diff --git a/journals/migrations/0064_auto_20190518_1304.py b/journals/migrations/0064_auto_20190518_1304.py
new file mode 100644
index 000000000..0ce6672b2
--- /dev/null
+++ b/journals/migrations/0064_auto_20190518_1304.py
@@ -0,0 +1,45 @@
+# Generated by Django 2.1.8 on 2019-05-18 11:04
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0063_auto_20190512_0918'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='issue',
+ options={'default_related_name': 'issues', 'ordering': ('-until_date',)},
+ ),
+ migrations.AlterModelOptions(
+ name='publication',
+ options={'default_related_name': 'publications', 'ordering': ('-publication_date', '-paper_nr')},
+ ),
+ migrations.AlterModelOptions(
+ name='reference',
+ options={'default_related_name': 'references', 'ordering': ['reference_number']},
+ ),
+ migrations.AlterModelOptions(
+ name='volume',
+ options={'default_related_name': 'volumes', 'ordering': ('-until_date',)},
+ ),
+ migrations.AlterField(
+ model_name='publication',
+ name='citedby',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True),
+ ),
+ migrations.AlterField(
+ model_name='publication',
+ name='metadata',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True),
+ ),
+ migrations.AlterField(
+ model_name='publication',
+ name='metadata_DOAJ',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True),
+ ),
+ ]
diff --git a/journals/models.py b/journals/models.py
index 8885e1daf..374ca1a92 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -434,14 +434,14 @@ class Publication(models.Model):
pubfractions_confirmed_by_authors = models.BooleanField(default=False)
# Metadata
- metadata = JSONField(default={}, blank=True, null=True)
+ metadata = JSONField(default=dict, blank=True, null=True)
metadata_xml = models.TextField(blank=True) # for Crossref deposit
- metadata_DOAJ = JSONField(default={}, blank=True, null=True)
+ metadata_DOAJ = JSONField(default=dict, blank=True, null=True)
doi_label = models.CharField(max_length=200, unique=True, db_index=True,
validators=[doi_publication_validator])
BiBTeX_entry = models.TextField(blank=True)
doideposit_needs_updating = models.BooleanField(default=False)
- citedby = JSONField(default={}, blank=True, null=True)
+ citedby = JSONField(default=dict, blank=True, null=True)
number_of_citations = models.PositiveIntegerField(default=0)
# Topics for semantic linking
diff --git a/organizations/migrations/0011_auto_20190518_1304.py b/organizations/migrations/0011_auto_20190518_1304.py
new file mode 100644
index 000000000..cac7e0e5f
--- /dev/null
+++ b/organizations/migrations/0011_auto_20190518_1304.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-05-18 11:04
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0010_auto_20190223_1406'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='organization',
+ name='crossref_json',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True),
+ ),
+ migrations.AlterField(
+ model_name='organization',
+ name='grid_json',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True),
+ ),
+ ]
diff --git a/organizations/models.py b/organizations/models.py
index 242df9914..53d896ebf 100644
--- a/organizations/models.py
+++ b/organizations/models.py
@@ -59,8 +59,8 @@ class Organization(models.Model):
logo = models.ImageField(upload_to='organizations/logos/', blank=True)
css_class = models.CharField(max_length=256, blank=True,
verbose_name="Additional logo CSS class")
- grid_json = JSONField(default={}, blank=True, null=True) # JSON data from GRID
- crossref_json = JSONField(default={}, blank=True, null=True) # JSON data from Crossref
+ grid_json = JSONField(default=dict, blank=True, null=True) # JSON data from GRID
+ crossref_json = JSONField(default=dict, blank=True, null=True) # JSON data from Crossref
parent = models.ForeignKey('self', blank=True, null=True,
on_delete=models.SET_NULL, related_name='children')
superseded_by = models.ForeignKey('self', blank=True, null=True,
diff --git a/profiles/migrations/0023_auto_20190518_1304.py b/profiles/migrations/0023_auto_20190518_1304.py
new file mode 100644
index 000000000..20dc3738e
--- /dev/null
+++ b/profiles/migrations/0023_auto_20190518_1304.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.1.8 on 2019-05-18 11:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('profiles', '0022_auto_20190331_1926'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='affiliation',
+ options={'default_related_name': 'affiliations', 'ordering': ['profile__last_name', 'profile__first_name', '-date_until']},
+ ),
+ migrations.AlterModelOptions(
+ name='profileemail',
+ options={'default_related_name': 'emails', 'ordering': ['-primary', '-still_valid', 'email']},
+ ),
+ ]
diff --git a/requirements.txt b/requirements.txt
index 6068d718f..6cc60bc15 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
# Core
argon2-cffi==16.3.0 # Password hashing algorithm
Babel==2.4
-Django==2.0.13
+Django==2.1.8 # 2019-05-18
feedparser==5.2.1 # Check: not updated since 2016
psycopg2==2.7.3 # PostgreSQL engine
pytz==2017.2 # Timezone package
diff --git a/scipost/migrations/0025_auto_20190518_1304.py b/scipost/migrations/0025_auto_20190518_1304.py
new file mode 100644
index 000000000..baf7e269c
--- /dev/null
+++ b/scipost/migrations/0025_auto_20190518_1304.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.1.8 on 2019-05-18 11:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0024_auto_20190405_2102'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='remark',
+ options={'default_related_name': 'remarks', 'ordering': ['date']},
+ ),
+ ]
diff --git a/submissions/admin.py b/submissions/admin.py
index ddf6b838a..a98d34377 100644
--- a/submissions/admin.py
+++ b/submissions/admin.py
@@ -43,7 +43,22 @@ class SubmissionAdminForm(forms.ModelForm):
class Meta:
model = Submission
fields = '__all__'
-
+ # fields = ['preprint', 'author_comments', 'author_list',
+ # 'discipline', 'domain', 'editor_in_charge',
+ # 'list_of_changes', 'open_for_commenting', 'open_for_reporting',
+ # 'referees_flagged', 'referees_suggested', 'remarks_for_editors',
+ # 'reporting_deadline', 'secondary_areas',
+ # 'status', 'is_current', 'visible_public', 'visible_pool',
+ # 'thread_hash', '_is_resubmission', 'refereeing_cycle',
+ # 'fellows', 'subject_area', 'submission_type', 'submitted_by',
+ # 'voting_fellows', 'submitted_to', 'proceedings',
+ # 'title', 'abstract', 'comments', 'needs_conflicts_update',
+ # 'plagiarism_report',
+ # 'arxiv_identifier_w_vn_nr', 'arxiv_identifier_wo_vn_nr',
+ # 'arxiv_vn_nr', 'arxiv_link', 'pdf_refereeing_pack',
+ # 'metadata', 'submission_date', 'acceptance_date',
+ # 'latest_activity', 'update_search_index',
+ # 'topics', 'needs_conflicts_update'
class SubmissionAdmin(GuardedModelAdmin):
date_hierarchy = 'submission_date'
@@ -113,7 +128,6 @@ class SubmissionAdmin(GuardedModelAdmin):
'referees_suggested',
'remarks_for_editors',
'submitted_to',
- 'proceedings',
'pdf_refereeing_pack',
'plagiarism_report',
'fellows',
@@ -121,9 +135,12 @@ class SubmissionAdmin(GuardedModelAdmin):
}),
('Meta', {
'classes': ('collapse',),
- 'fields': ('metadata', 'submission_date', 'needs_conflicts_update'),
+ 'fields': (
+ 'metadata',
+ 'submission_date',
+ 'needs_conflicts_update'
+ ),
}),
-
)
diff --git a/submissions/migrations/0056_auto_20190518_1157.py b/submissions/migrations/0056_auto_20190518_1157.py
new file mode 100644
index 000000000..ad8d47176
--- /dev/null
+++ b/submissions/migrations/0056_auto_20190518_1157.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.13 on 2019-05-18 09:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0055_auto_20190511_1141'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='needs_conflicts_update',
+ field=models.BooleanField(default=True),
+ ),
+ ]
diff --git a/submissions/migrations/0057_auto_20190518_1304.py b/submissions/migrations/0057_auto_20190518_1304.py
new file mode 100644
index 000000000..96be59034
--- /dev/null
+++ b/submissions/migrations/0057_auto_20190518_1304.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.1.8 on 2019-05-18 11:04
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0056_auto_20190518_1157'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='editorialcommunication',
+ options={'default_related_name': 'editorial_communications', 'ordering': ['timestamp']},
+ ),
+ migrations.AlterField(
+ model_name='submission',
+ name='metadata',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True),
+ ),
+ ]
diff --git a/submissions/models.py b/submissions/models.py
index 0fae5ba45..f36388204 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -130,7 +130,7 @@ class Submission(models.Model):
max_length=200, blank=True)
# Metadata
- metadata = JSONField(default={}, blank=True, null=True)
+ metadata = JSONField(default=dict, blank=True, null=True)
submission_date = models.DateField(verbose_name='submission date', default=datetime.date.today)
acceptance_date = models.DateField(verbose_name='acceptance date', null=True, blank=True)
latest_activity = models.DateTimeField(auto_now=True)
@@ -142,7 +142,6 @@ class Submission(models.Model):
objects = SubmissionQuerySet.as_manager()
# Temporary
- needs_conflicts_update = models.BooleanField(default=False)
invitation_order = models.IntegerField(default=0)
class Meta:
--
GitLab