hypershell 2.6.0__tar.gz → 2.6.2__tar.gz

{hypershell-2.6.0 → hypershell-2.6.2}/PKG-INFO

@@ -1,33 +1,35 @@
 Metadata-Version: 2.1
 Name: hypershell
-Version: 2.6.0
+Version: 2.6.2
 Summary: A cross-platform, high-throughput computing utility for processing shell commands over a distributed, asynchronous queue.
 Home-page: https://hypershell.org
 License: Apache-2.0
 Keywords: distributed-computing,command-line-tool,shell-scripting,high-performance-computing,high-throughput-computing
 Author: Geoffrey Lentner
 Author-email: glentner@purdue.edu
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Utilities
-Requires-Dist: cmdkit (>=2.7.5,<3.0.0)
+Provides-Extra: postgres
+Requires-Dist: cmdkit[toml] (>=2.7.7,<3.0.0)
 Requires-Dist: paramiko (>=3.4.0,<4.0.0)
-Requires-Dist: psycopg2 (>=2.9.9,<3.0.0)
+Requires-Dist: psycopg2 (>=2.9.9,<3.0.0) ; extra == "postgres"
+Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: rich (>=13.7.1,<14.0.0)
 Requires-Dist: sqlalchemy (>=2.0.29,<3.0.0)
-Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: tomlkit (>=0.13.2,<0.14.0)
 Project-URL: Documentation, https://hypershell.readthedocs.io
-Project-URL: Repository, https://github.com/glentner/hypershell
+Project-URL: Repository, https://github.com/hypershell/hypershell
 Description-Content-Type: text/x-rst
 
 HyperShell v2: Distributed Task Execution for HPC
@@ -37,8 +39,8 @@ HyperShell v2: Distributed Task Execution for HPC
     :target: https://www.apache.org/licenses/LICENSE-2.0
     :alt: License
 
-.. image:: https://img.shields.io/github/v/release/glentner/hypershell?sort=semver
-    :target: https://github.com/glentner/hypershell/releases
+.. image:: https://img.shields.io/github/v/release/hypershell/hypershell?sort=semver
+    :target: https://github.com/hypershell/hypershell/releases
     :alt: Github Release
 
 .. image:: https://img.shields.io/badge/Python-3.10+-blue.svg

{hypershell-2.6.0 → hypershell-2.6.2}/README.rst

@@ -5,8 +5,8 @@ HyperShell v2: Distributed Task Execution for HPC
     :target: https://www.apache.org/licenses/LICENSE-2.0
     :alt: License
 
-.. image:: https://img.shields.io/github/v/release/glentner/hypershell?sort=semver
-    :target: https://github.com/glentner/hypershell/releases
+.. image:: https://img.shields.io/github/v/release/hypershell/hypershell?sort=semver
+    :target: https://github.com/hypershell/hypershell/releases
     :alt: Github Release
 
 .. image:: https://img.shields.io/badge/Python-3.10+-blue.svg

{hypershell-2.6.0 → hypershell-2.6.2}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "hypershell"
-version = "2.6.0"
+version = "2.6.2"
 description = "A cross-platform, high-throughput computing utility for processing shell commands over a distributed, asynchronous queue."
 readme = "README.rst"
 license = "Apache-2.0"
 homepage = "https://hypershell.org"
 documentation = "https://hypershell.readthedocs.io"
-repository = "https://github.com/glentner/hypershell"
+repository = "https://github.com/hypershell/hypershell"
 authors = [
     "Geoffrey Lentner <glentner@purdue.edu>"
 ]
@@ -20,6 +20,7 @@ keywords = [
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Topic :: Utilities",
+    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -36,15 +37,18 @@ hyper-shell = "hypershell:main"  # NOTE: do not remove this
 hs = "hypershell:main"
 
 [tool.poetry.dependencies]
-python = ">=3.10,<4.0"
-cmdkit = "^2.7.5"
-toml = "^0.10.2"
+python = ">=3.9,<4.0"
+cmdkit = {version = "^2.7.7", extras = ["toml"]}
+pyyaml = "^6.0.2"
 tomlkit = "^0.13.2"
 sqlalchemy = "^2.0.29"
 rich = "^13.7.1"
 paramiko = "^3.4.0"
 psycopg2 = {version = "^2.9.9", optional = true}
 
+[tool.poetry.extras]
+postgres = ["psycopg2"]
+
 [tool.poetry.group.docs.dependencies]
 sphinx = "^7.2.6"
 sphinx-sitemap = "^2.5.1"
@@ -60,9 +64,7 @@ furo = "^2024.1.29"
 [tool.poetry.group.dev.dependencies]
 psycopg2 = "^2.9.9"
 pytest = "^8.1.1"
-pytest-cov = "^5.0.0"
 hypothesis = "^6.100.0"
-ipython = "^8.23.0"
 sphinx-autobuild = "^2024.2.4"
 
 [build-system]

{hypershell-2.6.0 → hypershell-2.6.2}/src/hypershell/__init__.py

@@ -94,11 +94,9 @@ class HyperShellApp(ApplicationGroup):
     interface = Interface(APP_NAME, APP_USAGE, APP_HELP)
     interface.add_argument('-v', '--version', action='version',
                            version=f'HyperShell v{__version__} (Python {python_version()})')
-
     interface.add_argument('--citation', action='version', version=__citation__)
     interface.add_argument('command')
 
-    command = None
     commands = {
         'submit': SubmitApp,
         'server': ServerApp,

{hypershell-2.6.0 → hypershell-2.6.2}/src/hypershell/config.py

@@ -17,7 +17,7 @@ import contextlib
 import subprocess
 
 # external libs
-import toml
+import tomlkit
 from pygments.styles import STYLE_MAP as CONSOLE_THEMES
 from cmdkit.app import Application, ApplicationGroup
 from cmdkit.cli import Interface, ArgumentError
@@ -239,19 +239,9 @@ class ConfigGetApp(Application):
     def format_section(self: ConfigGetApp, value: dict) -> str:
         """Format an entire section for output."""
         if self.varpath == '.':
-            value = toml.dumps(value)
+            return tomlkit.dumps(value)
         else:
-            value = toml.dumps({self.varpath: value})
-        # NOTE: Fix weird formatting of section headings.
-        #       The `toml.dumps` output has unnecessary quoting.
-        lines = []
-        for line in value.strip().split('\n'):
-            if not line.startswith('['):
-                lines.append(line)
-            else:
-                lines.append(line.replace('"', ''))
-        value = '\n'.join(lines)
-        return value
+            return tomlkit.dumps({self.varpath: value})
 
 
 SET_PROGRAM = 'hs config set'
@@ -442,10 +432,8 @@ class ConfigApp(ApplicationGroup):
     """Manage configuration."""
 
     interface = Interface(PROGRAM, USAGE, HELP)
-
     interface.add_argument('command')
 
-    command = None
     commands = {'get': ConfigGetApp,
                 'set': ConfigSetApp,
                 'edit': ConfigEditApp,

{hypershell-2.6.0 → hypershell-2.6.2}/src/hypershell/data/core.py

@@ -24,7 +24,7 @@ from sqlalchemy.exc import ArgumentError
 # internal libs
 from hypershell.core.config import config
 from hypershell.core.logging import handler
-from hypershell.core.exceptions import write_traceback
+from hypershell.core.exceptions import display_critical, write_traceback
 
 # public interface
 __all__ = ['DatabaseURL', 'engine', 'Session', 'config', 'in_memory', 'schema', ]
@@ -220,6 +220,13 @@ try:
     engine = get_engine()
     factory = sessionmaker(bind=engine)
     Session = scoped_session(factory)
+except ModuleNotFoundError as error:
+    if 'psycopg2' in error.args[0]:
+        display_critical(f'Missing optional dependency "psycopg2" needed for PostgreSQL', module=__name__)
+        sys.exit(exit_status.runtime_error)
+    else:
+        write_traceback(error, module=__name__)
+        sys.exit(exit_status.bad_config)
 except Exception as error:
     write_traceback(error, module=__name__)
     sys.exit(exit_status.bad_config)

{hypershell-2.6.0 → hypershell-2.6.2}/src/hypershell/server.py

@@ -92,9 +92,6 @@ class SchedulerState(State, Enum):
     HALT = 5
 
 
-# Note:
-#   Unless specified otherwise for larger problems, a bundle of size one allows
-#   for greater concurrency on smaller workloads.
 DEFAULT_BUNDLESIZE: Final[int] = default.server.bundlesize
 """Default size for task bundles."""
 

{hypershell-2.6.0 → hypershell-2.6.2}/src/hypershell/task.py

@@ -1047,11 +1047,9 @@ class TaskGroupApp(ApplicationGroup):
     """Search, submit, track, and manage individual tasks."""
 
     interface = Interface(TASK_PROGRAM, TASK_USAGE, TASK_HELP)
-
-    interface.add_argument('command')
     interface.add_argument('--list-columns', action='version', version=' '.join(Task.columns))
+    interface.add_argument('command')
 
-    command = None
     commands = {
         'submit': TaskSubmitApp,
         'info': TaskInfoApp,