Browse Source

Revert incomplete and incorrect build_config move.

pull/5918/head
Richard Tibbles 2 years ago
parent
commit
4c4030aa6b
  1. 4
      MANIFEST.in
  2. 2
      build_tools/customize_build.py
  3. 3
      kolibri/plugins/__init__.py
  4. 0
      kolibri/utils/build_config/__init__.py

4
MANIFEST.in

@ -25,8 +25,8 @@ recursive-exclude kolibri/* *pyc
recursive-exclude kolibri/core/assets *
recursive-exclude kolibri/plugins/*/assets *
recursive-exclude kolibri/plugins/*/node_modules *
exclude kolibri/*/build_config.json
exclude kolibri/plugins/*/build_config.json
exclude kolibri/*/buildConfig.js
exclude kolibri/plugins/*/buildConfig.js
recursive-exclude kolibri/dist *pyc
prune kolibri/dist/*/__pycache___

2
build_tools/customize_build.py

@ -44,7 +44,7 @@ def load_plugins_from_file(file_path):
build_config_path = os.path.join(
os.path.dirname(__file__), "../kolibri/plugins/utils/build_config"
os.path.dirname(__file__), "../kolibri/utils/build_config"
)
default_settings_template = "settings_path = '{path}'"

3
kolibri/plugins/__init__.py

@ -10,7 +10,6 @@ from abc import ABCMeta
from importlib import import_module
from django.utils.module_loading import module_has_submodule
from six import with_metaclass
from kolibri.utils.conf import KOLIBRI_HOME
@ -23,7 +22,7 @@ try:
# in the root of the Kolibri repository. The default list is identical to the list below,
# except that the style_guide plugin is not enabled in production builds.
# Caveat: this list may have been changed at build time to specify a different list of plugins.
from kolibri.plugins.utils.build_config.default_plugins import plugins
from kolibri.utils.build_config.default_plugins import plugins
DEFAULT_PLUGINS = plugins
except ImportError:

0
kolibri/plugins/utils/build_config/__init__.py → kolibri/utils/build_config/__init__.py

Loading…
Cancel
Save