From fb98cf3585100ea72bffefd47d7a536a8e773401 Mon Sep 17 00:00:00 2001
From: Sergey Golitsynskiy <sgolitsynskiy@gmail.com>
Date: Thu, 22 Aug 2019 15:46:08 -0400
Subject: [PATCH] Move config_manage out of webapps/ into config/

First pass.
---
 Makefile                                              | 2 +-
 lib/galaxy/config/__init__.py                         | 2 +-
 lib/galaxy/{webapps => config}/config_manage.py       | 0
 test/unit/webapps/config_manage/test_appschema.py     | 2 +-
 test/unit/webapps/config_manage/test_config_manage.py | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/galaxy/{webapps => config}/config_manage.py (100%)

diff --git a/Makefile b/Makefile
index 777f587abf9..830bc896db0 100644
--- a/Makefile
+++ b/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
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
index 2f29ff4ec44..0c49f4b3d10 100644
--- a/lib/galaxy/config/__init__.py
+++ b/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__)
diff --git a/lib/galaxy/webapps/config_manage.py b/lib/galaxy/config/config_manage.py
similarity index 100%
rename from lib/galaxy/webapps/config_manage.py
rename to lib/galaxy/config/config_manage.py
diff --git a/test/unit/webapps/config_manage/test_appschema.py b/test/unit/webapps/config_manage/test_appschema.py
index c6f0467f4cc..13eddba2900 100644
--- a/test/unit/webapps/config_manage/test_appschema.py
+++ b/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):
diff --git a/test/unit/webapps/config_manage/test_config_manage.py b/test/unit/webapps/config_manage/test_config_manage.py
index 0bb17d83208..51165e40650 100644
--- a/test/unit/webapps/config_manage/test_config_manage.py
+++ b/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__)