Rename galaxy-client package to galaxy-web-client

lib/galaxy/webapps/base/webapp.py

@@ -64,8 +64,8 @@ from galaxy.web.framework import (
 from galaxy.web.framework.middleware.static import CacheableStaticURLParser as Static
 
 try:
-    import galaxy.client
-    default_static_dir = os.path.dirname(galaxy.client.__file__)
+    import galaxy.web_client
+    default_static_dir = os.path.dirname(galaxy.web_client.__file__)
 except ImportError:
     default_static_dir = "static/"
 

packages/client/MANIFEST.in

@@ -1,2 +0,0 @@
-include galaxy/client/client_build_hash.txt
-recursive-include galaxy/client/dist *

packages/client/README.rst

@@ -1,13 +0,0 @@
-
-.. image:: https://badge.fury.io/py/galaxy-client.svg
-   :target: https://pypi.org/project/galaxy-client/
-
-
-Overview
---------
-
-The Galaxy_ client (frontend).
-
-* Code: https://github.com/galaxyproject/galaxy
-
-.. _Galaxy: http://galaxyproject.org/

packages/web_client/MANIFEST.in

@@ -0,0 +1,2 @@
+include galaxy/web_client/client_build_hash.txt
+recursive-include galaxy/web_client/dist *

packages/web_client/README.rst

@@ -0,0 +1,13 @@
+
+.. image:: https://badge.fury.io/py/galaxy-web-client.svg
+   :target: https://pypi.org/project/galaxy-web-client/
+
+
+Overview
+--------
+
+The Galaxy_ web client (frontend).
+
+* Code: https://github.com/galaxyproject/galaxy
+
+.. _Galaxy: http://galaxyproject.org/

packages/web_client/galaxy/web_client/install.py

@@ -5,24 +5,24 @@ import shutil
 import sys
 
 
-DESCRIPTION = """Install Galaxy client from package path.
+DESCRIPTION = """Install Galaxy web client from package path.
 
-This utility installs the Galaxy client from its Python package location to
+This utility installs the Galaxy web client from its Python package location to
 another location, typically in order to be served by a proxy server in
 production Galaxy installations.
 
-The --mode option specifies how the client is installed:
+The --mode option specifies how the web client is installed:
 
     relative (default):
-        Create a symlink at DEST with a relative path target to the Galaxy
+        Create a symlink at DEST with a relative path target to the Galaxy web
         client's package directory
 
     absolute:
-        Create a symlink at DEST with an absolute path target to the Galaxy
+        Create a symlink at DEST with an absolute path target to the Galaxy web
         client's package directory
 
     copy:
-        Copy the Galaxy client to DEST
+        Copy the Galaxy web client to DEST
 """
 
 CLIENT = os.path.join(os.path.dirname(__file__))
@@ -34,7 +34,7 @@ def main(argv=None):
     args = _arg_parser().parse_args(argv)
 
     dist = os.path.join(CLIENT, "dist")
-    assert os.path.exists(dist), f"ERROR: Cannot find client at expected path: {dist}"
+    assert os.path.exists(dist), f"ERROR: Cannot find web client at expected path: {dist}"
     if args.mode in ("absolute", "relative"):
         _symlink(args.dest, args.mode == "absolute", args.force_overwrite)
     elif args.mode == "copy":

packages/web_client/setup.cfg

@@ -25,15 +25,15 @@ license_files =
     LICENSE
 long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
-name = galaxy-client
+name = galaxy-web-client
 url = https://github.com/galaxyproject/galaxy
 version = 25.0.dev0
 
 [options]
 include_package_data = True
-packages = galaxy.client
+packages = galaxy.web_client
 python_requires = >=3.9
 
 [options.entry_points]
 console_scripts =
-        galaxy-client-install = galaxy.client.install:main
+        galaxy-web-client-install = galaxy.web_client.install:main