Prepare code for merge to master branch.

* Fix version number
* Make circle script more flexible for version bumps.
* Remove vestigial tests.
* Use find_packages in setup.py.

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.7.2.tar.gz"
+    - "pip uninstall -y xblock-problem-builder && python setup.py sdist && pip install dist/xblock-problem-builder-*.tar.gz"
     - "pip install -r test_requirements.txt"
     - "mkdir var"
 test:

problem_builder/tests/unit/test_problem_builder_migrate_keys.py

-"""
-Tests of the management command to copy Answer.course_id to Answer.course_key.
-"""
-from django.test import TestCase
-from opaque_keys.edx.keys import CourseKey
-
-from problem_builder.management.commands.problem_builder_migrate_keys import Command
-from problem_builder.models import Answer
-
-
-class TestProblemBuilderMigrateKeysCommand(TestCase):
-    """
-    Management command unit tests.
-    """
-    def setUp(self):
-        for i in xrange(12):
-            Answer.objects.create(
-                course_id=CourseKey.from_string('course-v1:Org+Course+{}'.format(i)),
-                course_key=None,
-            )
-
-    def test_command(self):
-        cmd = Command()
-        cmd.handle(batch_size=3, sleep=0)
-        for answer in Answer.objects.all():
-            self.assertEqual(answer.course_key, answer.course_id)
-
-    def test_existing_course_key(self):
-        cmd = Command()
-        answer = Answer.objects.get(course_id__endswith='+0')
-        answer.course_key = CourseKey.from_string('course-v1:This+is+different')
-        answer.save()
-        cmd.handle(batch_size=3, sleep=0)
-        answer.refresh_from_db()
-        self.assertNotEqual(answer.course_key, answer.course_id)

setup.py

@@ -21,7 +21,7 @@
 # Imports ###########################################################
 
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 # Functions #########################################################
@@ -71,13 +71,9 @@ BLOCKS = [
 
 setup(
     name='xblock-problem-builder',
-<<<<<<< HEAD
-    version='2.6.5patch1',
-=======
     version='2.7.2',
->>>>>>> master
     description='XBlock - Problem Builder',
-    packages=['problem_builder', 'problem_builder.v1', 'problem_builder.management', 'problem_builder.management.commands'],
+    packages=find_packages(),
     install_requires=[
         'XBlock',
         'xblock-utils',