Merge pull request #154 from open-craft/bradmerlin/deprecation-warnings

[OC-2856] Fixed deprecation warnings for the Answer and Share models

circle.yml

@@ -11,7 +11,7 @@ dependencies:
     - "pip install -r requirements.txt"
     - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/base.txt"
     - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/test.txt"
-    - "pip uninstall -y xblock-problem-builder && python setup.py sdist && pip install dist/xblock-problem-builder-2.6.9.tar.gz"
+    - "pip uninstall -y xblock-problem-builder && python setup.py sdist && pip install dist/xblock-problem-builder-2.6.10.tar.gz"
     - "pip install -r test_requirements.txt"
     - "mkdir var"
 test:

problem_builder/models.py

@@ -35,6 +35,9 @@ class Answer(models.Model):
     """
 
     class Meta:
+        # Since problem_builder isn't added to INSTALLED_APPS until it's imported,
+        # specify the app_label here.
+        app_label = 'problem_builder'
         unique_together = (
             ('student_id', 'course_id', 'name'),
             ('student_id', 'course_key', 'name'),
@@ -69,4 +72,7 @@ class Share(models.Model):
     notified = models.BooleanField(default=False, db_index=True)
 
     class Meta(object):
+        # Since problem_builder isn't added to INSTALLED_APPS until it's imported,
+        # specify the app_label here.
+        app_label = 'problem_builder'
         unique_together = (('shared_by', 'shared_with', 'block_id'),)

setup.py

@@ -71,7 +71,7 @@ BLOCKS = [
 
 setup(
     name='xblock-problem-builder',
-    version='2.6.9',
+    version='2.6.10',
     description='XBlock - Problem Builder',
     packages=['problem_builder', 'problem_builder.v1'],
     install_requires=[