Merge pull request galaxyproject#17323 from galaxyproject/revert-1523…

…8-patch-13
ahmedhamidawan · Jan 18, 2024 · ac6fe73 · ac6fe73
2 parents b4b1def + 61f3db2
commit ac6fe73
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 199 deletions.
diff --git a/lib/galaxy/authnz/custos_authnz.py b/lib/galaxy/authnz/custos_authnz.py
@@ -194,7 +194,7 @@ def callback(self, state_token, authz_code, trans, login_redirect_url):
                     if trans.app.config.fixed_delegated_auth:
                         user = existing_user
                     else:
-                        message = f"There already exists a user with email {email}. To associate this external login, you must first be logged in as that existing account."
+                        message = f"There already exists a user with email {email}.  To associate this external login, you must first be logged in as that existing account."
                         log.info(message)
                         login_redirect_url = (
                             f"{login_redirect_url}login/start"

diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py
@@ -205,7 +205,7 @@ def check_total_perspective_vortex(self):
     def check_pbs_python(self):
         return "galaxy.jobs.runners.pbs:PBSJobRunner" in self.job_runners
 
-    def check_pykube_ng(self):
+    def check_pykube(self):
         return "galaxy.jobs.runners.kubernetes:KubernetesJobRunner" in self.job_runners or which("kubectl")
 
     def check_chronos_python(self):

diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt
@@ -35,7 +35,7 @@ custos-sdk
 chronos-python==1.2.1
 
 # Kubernetes job runner
-pykube-ng==21.3.0
+pykube==0.15.0
 
 # Synnefo / Pithos+ object store client
 kamaki