Update the import statement for xblock-utils

The `xblock-utils` library has been deprecated as a separate package;
the `utils` library has been moved into the `XBlock` and should now
be imported from `xblock.utils` instead.
(openedx/XBlock#675)

Fixes: citynetwork#38

markdown_xblock/html.py

@@ -8,10 +8,10 @@
 from django.conf import settings as django_settings
 from xblock.core import XBlock
 from xblock.fields import List, Scope, String
-from xblock.fragment import Fragment
-from xblockutils.resources import ResourceLoader
-from xblockutils.settings import XBlockWithSettingsMixin
-from xblockutils.studio_editable import StudioEditableXBlockMixin, loader
+from web_fragments.fragment import Fragment
+from xblock.utils.resources import ResourceLoader
+from xblock.utils.settings import XBlockWithSettingsMixin
+from xblock.utils.studio_editable import StudioEditableXBlockMixin, loader
 
 from .utils import _
 
@@ -276,15 +276,15 @@ def get_editable_fields(self):
         return fields
 
     @classmethod
-    def parse_xml(cls, node, runtime, keys, id_generator):
+    def parse_xml(cls, node, runtime, keys):
         """
         Use `node` to construct a new block.
         """
         block = runtime.construct_xblock_from_class(cls, keys)
 
         # Read markdown content from file and add to editor.
         url_name = node.get('url_name', node.get('slug'))
-        location = id_generator.create_definition(node.tag, url_name)
+        location = runtime.id_generator.create_definition(node.tag, url_name)
 
         filename = node.get('filename')
         pointer_path = "{category}/{url_path}".format(

requirements/base.txt

@@ -1,7 +1,5 @@
 # Requirements for app run
 
-xblock-utils<=4.0.0
-xblock-sdk<0.9.0
 django-statici18n<2.5
 edx-i18n-tools<1.4
 Mako==1.2.4

requirements/test.txt

@@ -11,4 +11,3 @@ mock==3.0.5
 
 # Github requirements
 django-pyfs<3.2
-xblock-sdk<0.9.0

setup.py

@@ -41,7 +41,7 @@ def package_data(pkg, roots):
         'markdown_xblock',
     ],
     install_requires=[
-        'XBlock<=1.9',
+        'XBlock>=2.0',
         'markdown2>=2.3.9',
         'Pygments>=2.0.1'
     ],