From ade088b38b40d742b79882318c37b4ed3b50f1a0 Mon Sep 17 00:00:00 2001
From: John Davis <jdavcs@gmail.com>
Date: Thu, 21 Sep 2023 09:34:18 -0400
Subject: [PATCH] Drop old repositories, group repo functions in one module

---
 lib/galaxy/managers/users.py                   | 2 +-
 lib/galaxy/webapps/galaxy/controllers/user.py  | 2 +-
 lib/tool_shed/test/base/test_db_util.py        | 2 +-
 lib/tool_shed/webapp/controllers/repository.py | 2 +-
 test/integration/test_user_preferences.py      | 2 +-
 test/integration/test_vault_extra_prefs.py     | 2 +-
 test/integration/test_vault_file_source.py     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py
index 8a3ce9cba072..86879131d12d 100644
--- a/lib/galaxy/managers/users.py
+++ b/lib/galaxy/managers/users.py
@@ -37,7 +37,7 @@
 )
 from galaxy.model import UserQuotaUsage
 from galaxy.model.base import transaction
-from galaxy.model.repositories.user import (
+from galaxy.model.repositories import (
     get_user_by_email,
     get_user_by_username,
 )
diff --git a/lib/galaxy/webapps/galaxy/controllers/user.py b/lib/galaxy/webapps/galaxy/controllers/user.py
index 31a43eb3c31e..275510cff2ee 100644
--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -18,7 +18,7 @@
 )
 from galaxy.exceptions import Conflict
 from galaxy.managers import users
-from galaxy.model.repositories.user import get_user_by_email
+from galaxy.model.repositories import get_user_by_email
 from galaxy.security.validate_user_input import (
     validate_email,
     validate_publicname,
diff --git a/lib/tool_shed/test/base/test_db_util.py b/lib/tool_shed/test/base/test_db_util.py
index e7e4c88415f9..1f1655ec73a3 100644
--- a/lib/tool_shed/test/base/test_db_util.py
+++ b/lib/tool_shed/test/base/test_db_util.py
@@ -10,7 +10,7 @@
 import galaxy.model
 import galaxy.model.tool_shed_install
 import tool_shed.webapp.model as model
-from galaxy.model.repositories.user import get_user_by_username
+from galaxy.model.repositories import get_user_by_username
 
 log = logging.getLogger("test.tool_shed.test_db_util")
 
diff --git a/lib/tool_shed/webapp/controllers/repository.py b/lib/tool_shed/webapp/controllers/repository.py
index 747162130692..0f0b9548e7f7 100644
--- a/lib/tool_shed/webapp/controllers/repository.py
+++ b/lib/tool_shed/webapp/controllers/repository.py
@@ -25,7 +25,7 @@
     web,
 )
 from galaxy.model.base import transaction
-from galaxy.model.repositories.user import get_user_by_username
+from galaxy.model.repositories import get_user_by_username
 from galaxy.tool_shed.util import dependency_display
 from galaxy.tools.repositories import ValidationContext
 from galaxy.web.form_builder import (
diff --git a/test/integration/test_user_preferences.py b/test/integration/test_user_preferences.py
index e6f758a3600e..f7a365393535 100644
--- a/test/integration/test_user_preferences.py
+++ b/test/integration/test_user_preferences.py
@@ -8,7 +8,7 @@
     put,
 )
 
-from galaxy.model.repositories.user import get_user_by_email
+from galaxy.model.repositories import get_user_by_email
 from galaxy_test.driver import integration_util
 
 TEST_USER_EMAIL = "test_user_preferences@bx.psu.edu"
diff --git a/test/integration/test_vault_extra_prefs.py b/test/integration/test_vault_extra_prefs.py
index b1ad24643766..40b82c0ae04b 100644
--- a/test/integration/test_vault_extra_prefs.py
+++ b/test/integration/test_vault_extra_prefs.py
@@ -10,7 +10,7 @@
     put,
 )
 
-from galaxy.model.repositories.user import get_user_by_email
+from galaxy.model.repositories import get_user_by_email
 from galaxy_test.driver import integration_util
 
 TEST_USER_EMAIL = "vault_test_user@bx.psu.edu"
diff --git a/test/integration/test_vault_file_source.py b/test/integration/test_vault_file_source.py
index af58c069de4a..a3cf477721a5 100644
--- a/test/integration/test_vault_file_source.py
+++ b/test/integration/test_vault_file_source.py
@@ -1,7 +1,7 @@
 import os
 import tempfile
 
-from galaxy.model.repositories.user import get_user_by_email
+from galaxy.model.repositories import get_user_by_email
 from galaxy.security.vault import UserVaultWrapper
 from galaxy_test.base import api_asserts
 from galaxy_test.base.populators import DatasetPopulator