diff --git a/organizations/__init__.py b/organizations/__init__.py index 3de08839..c2193b9e 100644 --- a/organizations/__init__.py +++ b/organizations/__init__.py @@ -1,4 +1,4 @@ """ edx-organizations app initialization module """ -__version__ = '6.3.0' # pragma: no cover +__version__ = '6.4.0' # pragma: no cover diff --git a/organizations/api.py b/organizations/api.py index c54567c9..85d03d1d 100644 --- a/organizations/api.py +++ b/organizations/api.py @@ -286,15 +286,4 @@ def is_autocreate_enabled(): try: return bool(settings.ORGANIZATIONS_AUTOCREATE) except AttributeError: - pass - # TODO DEPR-117 - # ORGANIZATIONS_APP is the (soon-to-be-)deprecated feature flag - # that enabled edx-organizations in edx-platform. - # To ease migration, we accept the enabling of the old feature flag as a way of - # disabling automatic organization creation. - try: - features = settings.FEATURES - except AttributeError: - features = {} - old_organizations_flag_enabled = bool(features.get('ORGANIZATIONS_APP', False)) - return not old_organizations_flag_enabled + return True diff --git a/organizations/tests/test_api.py b/organizations/tests/test_api.py index 0240d4b6..812cdf28 100644 --- a/organizations/tests/test_api.py +++ b/organizations/tests/test_api.py @@ -432,14 +432,6 @@ def test_autocreate_enabled_by_default(self): """ assert api.is_autocreate_enabled() - @override_settings(FEATURES={"ORGANIZATIONS_APP": True}) - def test_autocreate_disabled_by_organizations_app(self): - """ - Tests that enabling FEATURES['ORGANIZATIONS_APP'] has the effect of - disabling automatic organization creation. - """ - assert not api.is_autocreate_enabled() - class BulkAddOrganizationsTestCase(utils.OrganizationsTestCaseBase): """