Merge pull request #8502 from ic4f/dev_move_config_manage

Move config_manage out of webapps/ into config/

Makefile

@@ -10,7 +10,7 @@ RELEASE_NEXT:=16.04
 RELEASE_NEXT_BRANCH:=dev
 RELEASE_UPSTREAM:=upstream
 MY_UPSTREAM:=origin
-CONFIG_MANAGE=$(IN_VENV) python lib/galaxy/webapps/config_manage.py
+CONFIG_MANAGE=$(IN_VENV) python lib/galaxy/config/config_manage.py
 PROJECT_URL?=https://github.com/galaxyproject/galaxy
 DOCS_DIR=doc
 DOC_SOURCE_DIR=$(DOCS_DIR)/source

lib/galaxy/config/__init__.py

@@ -47,7 +47,7 @@ from galaxy.web_stack import (
     get_stack_facts,
     register_postfork_function
 )
-from galaxy.webapps.config_manage import GALAXY_APP
+from .config_manage import GALAXY_APP
 from ..version import VERSION_MAJOR
 
 log = logging.getLogger(__name__)

test/unit/webapps/config_manage/test_appschema.py

@@ -1,4 +1,4 @@
-from galaxy.webapps.config_manage import AppSchema
+from galaxy.config.config_manage import AppSchema
 
 
 def test_get_reloadable_option_defaults(monkeypatch):

test/unit/webapps/config_manage/test_config_manage.py

@@ -5,7 +5,7 @@ import tempfile
 
 import yaml
 
-from galaxy.webapps.config_manage import main
+from galaxy.config.config_manage import main
 
 THIS_DIR = os.path.dirname(__file__)