From 967ca5a4f03a107a537f0a519e41bc0993cbcc4b Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Wed, 7 May 2025 11:00:09 -0400 Subject: [PATCH] Rename galaxy-client package to galaxy-web-client --- lib/galaxy/webapps/base/webapp.py | 4 ++-- packages/client/MANIFEST.in | 2 -- packages/client/README.rst | 13 ------------- packages/{client => web_client}/HISTORY.rst | 0 packages/{client => web_client}/LICENSE.txt | 0 packages/web_client/MANIFEST.in | 2 ++ packages/{client => web_client}/Makefile | 0 packages/web_client/README.rst | 13 +++++++++++++ .../galaxy/web_client}/__init__.py | 0 .../galaxy/web_client}/client_build_hash.txt | 0 .../galaxy/web_client}/install.py | 14 +++++++------- packages/{client => web_client}/pyproject.toml | 0 packages/{client => web_client}/setup.cfg | 6 +++--- 13 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 packages/client/MANIFEST.in delete mode 100644 packages/client/README.rst rename packages/{client => web_client}/HISTORY.rst (100%) rename packages/{client => web_client}/LICENSE.txt (100%) create mode 100644 packages/web_client/MANIFEST.in rename packages/{client => web_client}/Makefile (100%) create mode 100644 packages/web_client/README.rst rename packages/{client/galaxy/client => web_client/galaxy/web_client}/__init__.py (100%) rename packages/{client/galaxy/client => web_client/galaxy/web_client}/client_build_hash.txt (100%) rename packages/{client/galaxy/client => web_client/galaxy/web_client}/install.py (84%) rename packages/{client => web_client}/pyproject.toml (100%) rename packages/{client => web_client}/setup.cfg (90%) diff --git a/lib/galaxy/webapps/base/webapp.py b/lib/galaxy/webapps/base/webapp.py index db8bac81c55..d3ddad10b21 100644 --- a/lib/galaxy/webapps/base/webapp.py +++ b/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/" diff --git a/packages/client/MANIFEST.in b/packages/client/MANIFEST.in deleted file mode 100644 index 733a9b2cb7c..00000000000 --- a/packages/client/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -include galaxy/client/client_build_hash.txt -recursive-include galaxy/client/dist * diff --git a/packages/client/README.rst b/packages/client/README.rst deleted file mode 100644 index 601afafb1c8..00000000000 --- a/packages/client/README.rst +++ /dev/null @@ -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/ diff --git a/packages/client/HISTORY.rst b/packages/web_client/HISTORY.rst similarity index 100% rename from packages/client/HISTORY.rst rename to packages/web_client/HISTORY.rst diff --git a/packages/client/LICENSE.txt b/packages/web_client/LICENSE.txt similarity index 100% rename from packages/client/LICENSE.txt rename to packages/web_client/LICENSE.txt diff --git a/packages/web_client/MANIFEST.in b/packages/web_client/MANIFEST.in new file mode 100644 index 00000000000..13e9ccc808d --- /dev/null +++ b/packages/web_client/MANIFEST.in @@ -0,0 +1,2 @@ +include galaxy/web_client/client_build_hash.txt +recursive-include galaxy/web_client/dist * diff --git a/packages/client/Makefile b/packages/web_client/Makefile similarity index 100% rename from packages/client/Makefile rename to packages/web_client/Makefile diff --git a/packages/web_client/README.rst b/packages/web_client/README.rst new file mode 100644 index 00000000000..59c1d065250 --- /dev/null +++ b/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/ diff --git a/packages/client/galaxy/client/__init__.py b/packages/web_client/galaxy/web_client/__init__.py similarity index 100% rename from packages/client/galaxy/client/__init__.py rename to packages/web_client/galaxy/web_client/__init__.py diff --git a/packages/client/galaxy/client/client_build_hash.txt b/packages/web_client/galaxy/web_client/client_build_hash.txt similarity index 100% rename from packages/client/galaxy/client/client_build_hash.txt rename to packages/web_client/galaxy/web_client/client_build_hash.txt diff --git a/packages/client/galaxy/client/install.py b/packages/web_client/galaxy/web_client/install.py similarity index 84% rename from packages/client/galaxy/client/install.py rename to packages/web_client/galaxy/web_client/install.py index 3c6f9ebf951..cc9d002ad47 100644 --- a/packages/client/galaxy/client/install.py +++ b/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": diff --git a/packages/client/pyproject.toml b/packages/web_client/pyproject.toml similarity index 100% rename from packages/client/pyproject.toml rename to packages/web_client/pyproject.toml diff --git a/packages/client/setup.cfg b/packages/web_client/setup.cfg similarity index 90% rename from packages/client/setup.cfg rename to packages/web_client/setup.cfg index aad6d76c1ac..e1e28f289bb 100644 --- a/packages/client/setup.cfg +++ b/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