Merge pull request #245 from uccser/release/1.5.4

Merge updated 2.0.0 release branch into develop

CHANGELOG.md

@@ -1,12 +1,52 @@
 # Changelog
 
+## 2.0.0
+
+Adds gamification elements (points and achievements) to the website, including for all previous submissions for each user.
+
+- Add gamification system that allows users to earn points and achievements.
+- Add ability for the CodeWOF server to recalculate a user's points and achievements from their past attempts.
+- Improve the CodeWOF admin site with more information and filtering options.
+- Update Django from 2.1.5 to 2.2.3.
+- Dependency updates:
+    - Remove django-coverage-plugin.
+    - Update coverage from 4.5.4 to 5.1.
+    - Update django-activeurl from 0.1.12 to 0.2.0.
+    - Update django-allauth from 0.39.1 to 0.41.0.
+    - Update django-ckeditor from 5.7.1 to 5.9.0.
+    - Update django-crispy-forms from 1.7.2 to 1.9.0.
+    - Update django-debug-toolbar from 2.0 to 2.2.
+    - Update django-extensions from 2.2.1 to 2.2.9.
+    - Update django-modeltranslation from 0.13.3 to 0.14.4.
+    - Update django-model-utils from 3.2.0 to 4.0.0.
+    - Update django-recaptcha from 2.0.5 to 2.0.6.
+    - Update django-redis from 4.10.0 to 4.11.0.
+    - Update django-storages from 1.7.1 to 1.9.1.
+    - Update google-api-python-client from 1.7.11 to 1.7.12.
+    - Update google-auth from 1.6.3 to 1.12.0.
+    - Update google-cloud-logging from 1.12.1 to 1.15.0.
+    - Update mypy from 0.720 to 0.770.
+    - Update Pillow from 6.1.0 to 7.0.0.
+    - Update pydocstyle from 4.0.1 to 5.0.2.
+    - Update pytest from 5.1.1 to 5.4.1.
+    - Update pytest-django from 3.5.1 to 3.8.0.
+    - Update PyYAML from 5.1.2 to 5.3.1.
+    - Update Sphinx from 2.2.0 to 3.0.4.
+
+## 1.5.3
+
+- Use default settings for split health checks.
+
 ## 1.5.2
+
 - Split GCP health check URLs.
 
 ## 1.5.1
+
 - Update GCP health checks.
 
 ## 1.5.0
+
 - Add 7 new questions.
 - Fix test case where no argument was passed for the total of evens question. Fixes #101
 - Fix error in example of the driver speed question.
@@ -34,7 +74,7 @@
 - Fix bug where whitespace of user code in attempt wasn't shown in admin interface.
 - Fix bug where sender's email address is not listed on contact us forms sent to admin.
 - General typo fixes and question clarifications.
-- Dependencies changes:
+- Dependency updates:
     - Update django-recaptcha from 2.0.4 to 2.0.5.
     - Update google-api-python-client from 1.7.10 to 1.7.11.
     - Update pydocstyle from 4.0.0 to 4.0.1.

codewof/config/__init__.py

@@ -1,6 +1,6 @@
 """Configuration for Django system."""
 
-__version__ = "1.5.4"
+__version__ = "2.0.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

codewof/general/management/commands/sampledata.py

@@ -26,7 +26,7 @@ def add_arguments(self, parser):
             '--skip_backdate',
             action='store_true',
             help='skip backdate step',
-            )
+        )
 
     def handle(self, *args, **options):
         """Automatically called when the sampledata command is given."""
@@ -85,8 +85,8 @@ def handle(self, *args, **options):
         management.call_command('load_questions')
         print('Programming questions loaded.\n')
 
-        management.call_command('load_badges')
-        print('Achievement badges loaded.\n')
+        management.call_command('load_achievements')
+        print('Achievements loaded.\n')
 
         # Research
         StudyFactory.create_batch(size=5)
@@ -97,8 +97,8 @@ def handle(self, *args, **options):
         AttemptFactory.create_batch(size=50)
         print('Attempts loaded.\n')
 
-        # Award points and badges
+        # Award points and achievements
         if not skip:
-            management.call_command('backdate_points_and_badges')
+            management.call_command('backdate_points_and_achievements')
         else:
             print('Ignoring backdate step as requested.\n')

codewof/programming/admin.py

@@ -10,7 +10,7 @@
     QuestionTypeParsons,
     QuestionTypeDebugging,
     Profile,
-    Badge,
+    Achievement,
     Earned,
 )
 
@@ -27,7 +27,7 @@ class TestCaseAttemptInline(admin.TabularInline):
 
 
 class EarnedInline(admin.TabularInline):
-    """Configuration to show earned badges inline within profile admin."""
+    """Configuration to show earned achievements inline within profile admin."""
 
     model = Earned
     extra = 1
@@ -42,19 +42,19 @@ class ProfileAdmin(admin.ModelAdmin):
     inlines = (EarnedInline, )
 
 
-class BadgeAdmin(admin.ModelAdmin):
-    """Configuration for displaying badges in admin."""
+class AchievementAdmin(admin.ModelAdmin):
+    """Configuration for displaying achievements in admin."""
 
-    list_display = ('id_name', 'display_name', 'badge_tier')
-    list_filter = ['badge_tier']
+    list_display = ('id_name', 'display_name', 'achievement_tier')
+    list_filter = ['achievement_tier']
     ordering = ('id_name', )
 
 
 class EarnedAdmin(admin.ModelAdmin):
-    """Configuration for displaying earned badges in admin."""
+    """Configuration for displaying earned achievements in admin."""
 
-    list_display = ('date', 'badge', 'profile')
-    list_filter = ['badge']
+    list_display = ('date', 'achievement', 'profile')
+    list_filter = ['achievement']
     ordering = ('-date', )
 
 
@@ -80,5 +80,5 @@ class Media:
 admin.site.register(QuestionTypeParsons)
 admin.site.register(QuestionTypeDebugging)
 admin.site.register(Profile, ProfileAdmin)
-admin.site.register(Badge, BadgeAdmin)
+admin.site.register(Achievement, AchievementAdmin)
 admin.site.register(Earned, EarnedAdmin)