...

tests/test_enviformer.py

@@ -1,10 +1,15 @@
 from collections import defaultdict
 from datetime import datetime
 from tempfile import TemporaryDirectory
+
+from django.conf import settings as s
 from django.test import TestCase, tag
+
 from epdb.logic import PackageManager
-from epdb.models import User, EnviFormer, Package, Setting
-from epdb.tasks import predict_simple, predict
+from epdb.models import EnviFormer, Setting, User
+from epdb.tasks import predict, predict_simple
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 def measure_predict(mod, pathway_pk=None):

tests/test_model.py

@@ -1,10 +1,13 @@
 from tempfile import TemporaryDirectory
 
 import numpy as np
+from django.conf import settings as s
 from django.test import TestCase
 
 from epdb.logic import PackageManager
-from epdb.models import User, MLRelativeReasoning, Package
+from epdb.models import MLRelativeReasoning, User
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 class ModelTest(TestCase):

tests/test_multigen_eval.py

@@ -1,8 +1,12 @@
+from django.conf import settings as s
 from django.test import TestCase
 from networkx.utils.misc import graphs_equal
+
 from epdb.logic import PackageManager, SPathway
-from epdb.models import Pathway, User, Package
-from utilities.ml import multigen_eval, pathway_edit_eval, graph_from_pathway
+from epdb.models import Pathway, User
+from utilities.ml import graph_from_pathway, multigen_eval, pathway_edit_eval
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 class MultiGenTest(TestCase):

tests/test_simpleambitrule.py

@@ -1,9 +1,10 @@
-from unittest.mock import patch, MagicMock, PropertyMock
+from unittest.mock import MagicMock, PropertyMock, patch
 
+from django.conf import settings as s
 from django.test import TestCase
 
 from epdb.logic import PackageManager
-from epdb.models import User, SimpleAmbitRule
+from epdb.models import SimpleAmbitRule, User
 
 
 class SimpleAmbitRuleTest(TestCase):
@@ -209,7 +210,7 @@ class SimpleAmbitRuleTest(TestCase):
 
         self.assertEqual(rule.products_smarts, expected_products)
 
-    @patch("epdb.models.Package.objects")
+    @patch(f"{s.PACKAGE_MODULE_PATH}.objects")
     def test_related_reactions_property(self, mock_package_objects):
         """Test related_reactions property returns correct queryset."""
         mock_qs = MagicMock()

tests/views/test_model_views.py

@@ -1,9 +1,11 @@
+from django.conf import settings as s
 from django.test import TestCase, override_settings
 from django.urls import reverse
-from django.conf import settings as s
 
 from epdb.logic import UserManager
-from epdb.models import Package, User
+from epdb.models import User
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 @override_settings(MODEL_DIR=s.FIXTURE_DIRS[0] / "models", CELERY_TASK_ALWAYS_EAGER=True)

tests/views/test_package_views.py

@@ -4,7 +4,9 @@ from django.test import TestCase, tag
 from django.urls import reverse
 
 from epdb.logic import UserManager
-from epdb.models import Package, UserPackagePermission, Permission, GroupPackagePermission, Group
+from epdb.models import Group, GroupPackagePermission, Permission, UserPackagePermission
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 class PackageViewTest(TestCase):

tests/views/test_pathway_views.py

@@ -1,9 +1,11 @@
+from django.conf import settings as s
 from django.test import TestCase, override_settings
 from django.urls import reverse
-from django.conf import settings as s
 
-from epdb.logic import UserManager, PackageManager
-from epdb.models import Pathway, Edge
+from epdb.logic import PackageManager, UserManager
+from epdb.models import Edge, Pathway
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 @override_settings(MODEL_DIR=s.FIXTURE_DIRS[0] / "models", CELERY_TASK_ALWAYS_EAGER=True)

tests/views/test_reaction_views.py

@@ -1,9 +1,12 @@
+from django.conf import settings as s
 from django.test import TestCase
 from django.urls import reverse
-from envipy_additional_information import Temperature, Interval
+from envipy_additional_information import Interval, Temperature
 
-from epdb.logic import UserManager, PackageManager
-from epdb.models import Reaction, Scenario, ExternalDatabase
+from epdb.logic import PackageManager, UserManager
+from epdb.models import ExternalDatabase, Reaction, Scenario
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 class ReactionViewTest(TestCase):

tests/views/test_user_views.py

@@ -1,8 +1,11 @@
+from django.conf import settings as s
 from django.test import TestCase
+from django.urls import reverse
 
 from epdb.logic import PackageManager
-from epdb.models import Package, User
-from django.urls import reverse
+from epdb.models import User
+
+Package = s.GET_PACKAGE_MODEL()
 
 
 class UserViewTest(TestCase):