From b97753630dfd85b916e4819a7a0845b645a3c194 Mon Sep 17 00:00:00 2001
From: "Kyle D. McCormick" <kyle@axim.org>
Date: Tue, 13 Feb 2024 10:51:31 -0500
Subject: [PATCH] feat!: remove old XBlockMixin import locations

---
 xblock/__init__.py | 27 +--------------------------
 xblock/fields.py   |  1 -
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/xblock/__init__.py b/xblock/__init__.py
index d10628e18..ef8b012e2 100644
--- a/xblock/__init__.py
+++ b/xblock/__init__.py
@@ -2,29 +2,4 @@
 XBlock Courseware Components
 """
 
-# For backwards compatibility, provide the XBlockMixin in xblock.fields
-# without causing a circular import
-import codecs
-import os
-import warnings
-
-import xblock.core
-import xblock.fields
-
-
-class XBlockMixin(xblock.core.XBlockMixin):
-    """
-    A wrapper around xblock.core.XBlockMixin that provides backwards compatibility for the old location.
-
-    Deprecated.
-    """
-    def __init__(self, *args, **kwargs):
-        warnings.warn("Please use xblock.core.XBlockMixin", DeprecationWarning, stacklevel=2)
-        super().__init__(*args, **kwargs)
-
-
-# For backwards compatibility, provide the XBlockMixin in xblock.fields
-# without causing a circular import
-xblock.fields.XBlockMixin = XBlockMixin
-
-__version__ = '1.10.0'
+__version__ = '2.0.0'
diff --git a/xblock/fields.py b/xblock/fields.py
index 8a8e95a36..018944c21 100644
--- a/xblock/fields.py
+++ b/xblock/fields.py
@@ -26,7 +26,6 @@
     'BlockScope', 'UserScope', 'Scope', 'ScopeIds',
     'Field',
     'Boolean', 'Dict', 'Float', 'Integer', 'List', 'Set', 'String', 'XMLString',
-    'XBlockMixin',
 ]