Skip to content

Commit de47a7d

Browse files
committed
squash!: Fix migrations conflict
1 parent b7f31cc commit de47a7d

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

openedx_authz/migrations/0005_migrate_legacy_permissions.py renamed to openedx_authz/migrations/0006_migrate_legacy_permissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Migration(migrations.Migration):
5353
"""
5454

5555
dependencies = [
56-
("openedx_authz", "0004_contentlibraryscope"),
56+
("openedx_authz", "0005_policycachecontrol"),
5757
]
5858

5959
operations = [

openedx_authz/tests/test_imports.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Test module imports."""
2+
23
import sys
34
from unittest import TestCase
45

@@ -7,20 +8,19 @@ class TestImports(TestCase):
78
"""Test that imports work correctly."""
89

910
def setUp(self):
10-
"""Remove cached modules to ensure fresh imports and detect circular dependencies.
11-
"""
11+
"""Remove cached modules to ensure fresh imports and detect circular dependencies."""
1212
super().setUp()
1313

1414
# List of modules to remove from cache to test fresh imports
1515
modules_to_clear = [
16-
'openedx_authz.engine.enforcer',
17-
'openedx_authz.engine.matcher',
18-
'openedx_authz.engine.adapter',
19-
'openedx_authz.api',
20-
'openedx_authz.api.permissions',
21-
'openedx_authz.api.roles',
22-
'openedx_authz.api.users',
23-
'openedx_authz.api.data',
16+
"openedx_authz.engine.enforcer",
17+
"openedx_authz.engine.matcher",
18+
"openedx_authz.engine.adapter",
19+
"openedx_authz.api",
20+
"openedx_authz.api.permissions",
21+
"openedx_authz.api.roles",
22+
"openedx_authz.api.users",
23+
"openedx_authz.api.data",
2424
]
2525

2626
for module_name in modules_to_clear:
@@ -30,6 +30,7 @@ def setUp(self):
3030
def test_import_authzenforcer(self):
3131
"""Test that AuthzEnforcer can be imported."""
3232
from openedx_authz.engine.enforcer import AuthzEnforcer # pylint: disable=import-outside-toplevel
33+
3334
try:
3435
self.assertIsNotNone(AuthzEnforcer)
3536
except ImportError as e:

0 commit comments

Comments
 (0)