jesperhodge · jesperhodge · Sep 9, 2026 · Sep 11, 2026 · Sep 11, 2026 · Sep 14, 2026
diff --git a/.importlinter b/.importlinter
@@ -7,6 +7,7 @@
 root_packages =
     openedx_learning
     openedx_content
+    openedx_catalog
     openedx_tagging
     openedx_django_lib
     openedx_core
@@ -23,8 +24,8 @@ layers =
     # particular, openedx_tagging must never know that CBE exists.
     openedx_learning
 
-    # Content: authoring-side models and APIs.
-    openedx_content
+    # Content (authoring-side models and APIs) and Catalog (CatalogCourse/CourseRun) as siblings
+    openedx_content | openedx_catalog
 
     # Tagging is very simple & fundamental. Should probably not depend on any other Django apps.
     openedx_tagging

diff --git a/mypy.ini b/mypy.ini
@@ -12,5 +12,8 @@ files =
 [mypy-organizations.*]
 follow_untyped_imports = True
 
+[mypy-simple_history.*]
+follow_untyped_imports = True
+
 [mypy.plugins.django-stubs]
 django_settings_module = "projects.dev"
diff --git a/projects/dev.py b/projects/dev.py
@@ -37,6 +37,10 @@
     # Open edX Organizations (dependency for openedx_catalog)
     "organizations",
 
+    # Required for django-simple-history's admin integration and management commands;
+    # HistoricalRecords() alone does not need it.
+    "simple_history",
+
     # Our Apps
     "openedx_catalog",
     "openedx_learning",

diff --git a/requirements/base.in b/requirements/base.in
@@ -17,3 +17,5 @@ rules<4.0                 # Django extension for rules-based authorization check
 tomlkit                   # Parses and writes TOML configuration files
 
 edx-organizations         # Implemented the "Organization" model that CatalogCourse/CourseRun are keyed to
+
+django-simple-history     # History tracking for CBE criteria definitions, per ADR-0003
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -58,7 +58,9 @@ django-crum==0.7.9
 django-model-utils==5.0.0
     # via edx-organizations
 django-simple-history==3.13.0
-    # via edx-organizations
+    # via
+    #   -r requirements/base.in
+    #   edx-organizations
 django-waffle==5.0.0
     # via
     #   edx-django-utils

diff --git a/test_settings.py b/test_settings.py
@@ -54,6 +54,9 @@ def root(*args):
     "organizations",
     # django-rules based authorization
     'rules.apps.AutodiscoverRulesConfig',
+    # Required for django-simple-history's admin integration and management commands;
+    # HistoricalRecords() alone does not need it.
+    "simple_history",
     # Our own apps
     "openedx_tagging",
     "openedx_content",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,5 @@ rules<4.0 # Django extension for rules-based authorization check
		tomlkit # Parses and writes TOML configuration files

		edx-organizations # Implemented the "Organization" model that CatalogCourse/CourseRun are keyed to

		django-simple-history # History tracking for CBE criteria definitions, per ADR-0003