From 8c405e54df0a565c3485e30bfdeb4e99be6f90d4 Mon Sep 17 00:00:00 2001 From: xavierfav Date: Thu, 2 Sep 2021 15:39:50 +0200 Subject: [PATCH] Update django --- datasets/models.py | 4 +- .../datasets/dataset_release_explore.html | 2 +- .../dataset_release_taxonomy_node.html | 2 +- .../dataset_release_taxonomy_node_info.html | 2 +- datasets/tests/test_views.py | 54 +++++++++---------- requirements.txt | 6 +-- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/datasets/models.py b/datasets/models.py index cdef2bf0..bb3f99f8 100644 --- a/datasets/models.py +++ b/datasets/models.py @@ -754,8 +754,8 @@ class DatasetRelease(models.Model): ('PU', 'Public release'), ) type = models.CharField(max_length=2, choices=TYPE_CHOICES, default='IN') - release_data = JSONField(default={}) - taxonomy_node_stats = JSONField(default=[]) + release_data = JSONField(default=dict) + taxonomy_node_stats = JSONField(default=list) @property def avg_annotations_per_sound(self): diff --git a/datasets/templates/datasets/dataset_release_explore.html b/datasets/templates/datasets/dataset_release_explore.html index 103a9141..8a7bf5fb 100644 --- a/datasets/templates/datasets/dataset_release_explore.html +++ b/datasets/templates/datasets/dataset_release_explore.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% load humanize %} {% block title %}Explore{% endblock title %} {% block page_js %} diff --git a/datasets/templates/datasets/dataset_release_taxonomy_node.html b/datasets/templates/datasets/dataset_release_taxonomy_node.html index 89f30eec..8b01e732 100644 --- a/datasets/templates/datasets/dataset_release_taxonomy_node.html +++ b/datasets/templates/datasets/dataset_release_taxonomy_node.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% load dataset_templatetags %} {% load general_templatetags %} {% block title %}{{ node.name }}{% endblock title %} diff --git a/datasets/templates/datasets/dataset_release_taxonomy_node_info.html b/datasets/templates/datasets/dataset_release_taxonomy_node_info.html index deff0d10..63c53915 100644 --- a/datasets/templates/datasets/dataset_release_taxonomy_node_info.html +++ b/datasets/templates/datasets/dataset_release_taxonomy_node_info.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} {% load dataset_templatetags %} {% load general_templatetags %} {% block extra_head %} diff --git a/datasets/tests/test_views.py b/datasets/tests/test_views.py index fc14972f..009bc992 100644 --- a/datasets/tests/test_views.py +++ b/datasets/tests/test_views.py @@ -41,14 +41,14 @@ def test_save_contribute_validate_annotations_category(self): # check the response an that a vote is added in the database response = self.client.post(reverse('save-contribute-validate-annotations-per-category'), data=form_data) - self.assertEquals(response.status_code, 200) - self.assertEquals(Vote.objects.filter(candidate_annotation_id=annotation_object_id).count(), 1) + self.assertEqual(response.status_code, 200) + self.assertEqual(Vote.objects.filter(candidate_annotation_id=annotation_object_id).count(), 1) # check that a second vote is not added, or modified form_data['form-0-vote'] = '-1' self.client.post(reverse('save-contribute-validate-annotations-per-category'), data=form_data) - self.assertEquals(Vote.objects.filter(candidate_annotation_id=annotation_object_id).count(), 1) - self.assertEquals(Vote.objects.get(candidate_annotation_id=annotation_object_id).vote, 1) + self.assertEqual(Vote.objects.filter(candidate_annotation_id=annotation_object_id).count(), 1) + self.assertEqual(Vote.objects.get(candidate_annotation_id=annotation_object_id).vote, 1) class AdvancedContributeTest(TestCase): @@ -102,7 +102,7 @@ def test_first_page_duration(self): 'node_id': node_url, 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) selected_candidates = sorted([form[0].id for form in response.context['annotations_forms']]) self.assertListEqual(expected_annotation_ids, selected_candidates) @@ -120,7 +120,7 @@ def test_second_page_duration(self): 'node_id': node_url, 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) selected_candidates = [form[0].id for form in response.context['annotations_forms']] # create form data with the 12 annotation vote forms @@ -141,7 +141,7 @@ def test_second_page_duration(self): # submit form response = self.client.post(reverse('save-contribute-validate-annotations-per-category'), data=form_data) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # get the candidates second page response = self.client.get(reverse('contribute-validate-annotations-category', @@ -149,7 +149,7 @@ def test_second_page_duration(self): 'node_id': node_url, 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # check that the selected candidates correspond to the 12 sounds with duration > 10 sec expected_annotation_ids = sorted(CandidateAnnotation.objects @@ -211,7 +211,7 @@ def test_create_release_launch(self): 'short_name': 'fsd' }), data=form_data) - self.assertEquals(response.status_code, 302) # http redirect + self.assertEqual(response.status_code, 302) # http redirect # check that the release has been correctly created release = DatasetRelease.objects.first() @@ -237,7 +237,7 @@ def test_release_explore(self): 'release_tag': 'test' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.assertEqual(response.context['release'].release_tag, 'test') def test_download_release(self): @@ -262,7 +262,7 @@ def test_delete_release(self): })) self.assertEqual(list(DatasetRelease.objects.all()), []) - self.assertEquals(response.status_code, 302) # http redirect + self.assertEqual(response.status_code, 302) # http redirect def test_release_table(self): create_release() @@ -354,35 +354,35 @@ def test_dataset(self): kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_dataset_explore(self): response = self.client.get(reverse('dataset-explore', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_dataset_taxonomy_tree(self): response = self.client.get(reverse('taxonomy-tree', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_dataset_taxonomy_table(self): response = self.client.get(reverse('taxonomy-table', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_dataset_state_table(self): response = self.client.get(reverse('state-table', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_taxonomy_node(self): response = self.client.get(reverse('dataset-explore-taxonomy-node', @@ -390,14 +390,14 @@ def test_taxonomy_node(self): 'short_name': 'fsd', 'node_id': self.node_with_candidates.url_id })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_contribute(self): response = self.client.get(reverse('contribute', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_contribute_validate_annotations(self): response = self.client.get(reverse('contribute-validate-annotations-category', @@ -405,21 +405,21 @@ def test_contribute_validate_annotations(self): 'short_name': 'fsd', 'node_id': self.node_with_candidates.url_id })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_contribute_validate_annotations_easy(self): response = self.client.get(reverse('contribute-validate-annotations-category-beginner', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_contribute_validate_annotations_all(self): response = self.client.get(reverse('contribute-validate-annotations-all', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_contribute_validate_annotations_category(self): response = self.client.get(reverse('contribute-validate-annotations-category', @@ -427,35 +427,35 @@ def test_contribute_validate_annotations_category(self): 'short_name': 'fsd', 'node_id': self.node_with_candidates.url_id })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_choose_category(self): response = self.client.get(reverse('choose_category', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_dataset_taxonomy_table_choose(self): response = self.client.get(reverse('dataset_taxonomy_table_choose', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_dataset_taxonomy_table_search(self): response = self.client.get(reverse('taxonomy-table-search', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_dataset_taxonomy_table_search_all(self): response = self.client.get(reverse('taxonomy-table-search-all', kwargs={ 'short_name': 'fsd' })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_get_mini_node_info(self): response = self.client.get(reverse('get-mini-node-info', @@ -463,5 +463,5 @@ def test_get_mini_node_info(self): 'short_name': 'fsd', 'node_id': self.node_with_candidates.url_id })) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5cf384f8..bd3c6b15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ celery==4.1.1 dj-database-url==0.4.1 -django-debug-toolbar==1.11.1 +django-debug-toolbar==3.2.2 django-extensions==2.1.2 -django==2.2.24 +django==3.2.7 ipython==5.3.0 markdown==2.6.8 nltk==3.4.5 @@ -10,5 +10,5 @@ psycopg2==2.7.7 --no-binary psycopg2 pygments==2.7.4 sentry-sdk==0.14.4 redis==3.2.0 -social-auth-app-django==4.0.0 +social-auth-app-django==5.0.0 uwsgi==2.0.18