From 966d080294c131ed96b45c536b6679d95c67ca5f Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Thu, 2 Nov 2023 09:20:57 -0700 Subject: [PATCH] Revert "WIP: sketch out source code architecture for apidoc (#48)" This reverts commit 5570545e6cc5614907fe45d9559e41a63803deef. --- bin/benchpark | 11 ---------- docs/conf.py | 31 ----------------------------- lib/benchpark/benchpark/__init__.py | 16 --------------- 3 files changed, 58 deletions(-) delete mode 100644 lib/benchpark/benchpark/__init__.py diff --git a/bin/benchpark b/bin/benchpark index 6bac6ade2..b90cb86c8 100755 --- a/bin/benchpark +++ b/bin/benchpark @@ -8,8 +8,6 @@ import shutil import shlex import sys -import benchpark - DEBUG = False @@ -29,7 +27,6 @@ def main(): actions = {} benchpark_list(subparsers, actions) benchpark_setup(subparsers, actions) - benchpark_version(subparsers, actions) args = parser.parse_args() @@ -142,10 +139,6 @@ def benchpark_setup(subparsers, actions_dict): actions_dict["setup"] = benchpark_setup_handler -def benchpark_version(subparsers, actions_dict): - list_parser = subparsers.add_parser("version", help="Benchpark version") - list_parser.add_argument('sublist', nargs='?') - actions_dict["version"] = benchpark_version_handler def run_command(command_str, env=None): subprocess.run( @@ -275,9 +268,5 @@ Further steps are needed to run the experiments (ramble -P -D . on) print(instructions) -def benchpark_version_handler(args): - print(benchpark.benchpark_version) - - if __name__ == "__main__": main() diff --git a/docs/conf.py b/docs/conf.py index 26a3fb8f5..b605acaa2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -6,19 +6,6 @@ # -- Project information ----------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information -import os -import sys - -from sphinx.ext.apidoc import main as sphinx_apidoc - -# -- Benchpark customizations ------------------------------------------------ -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.append(os.path.abspath("../lib/benchpark/benchpark")) -print(sys.path) - - project = "Benchpark" copyright = "2023, LLNS LLC" author = "Olga Pearce, Alec Scott, Peter Scheibel, Greg Becker, Riyaz Haque, and Nathan Hanford" @@ -28,7 +15,6 @@ extensions = [ "sphinx_rtd_theme", - "sphinx.ext.autodoc", ] exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".spack-env"] @@ -38,20 +24,3 @@ html_theme = "sphinx_rtd_theme" html_static_path = ["_static"] - -# -- Run sphinx-apidoc ------------------------------------------------- -# Remove any previous API docs -# ReadtheDocs doesn't clean up after previous builds -# Without this, the API Docs will never actually update -apidoc_args = [ - "--force", # Overwrite existing files - "--no-toc", # Don't create a table of contents file - "--output-dir=.", # Directory to place all output - "--module-first", # emit module docs before submodule docs -] -sphinx_apidoc( - apidoc_args - + [ - "../lib/benchpark/benchpark", - ] -) diff --git a/lib/benchpark/benchpark/__init__.py b/lib/benchpark/benchpark/__init__.py deleted file mode 100644 index f81316c6b..000000000 --- a/lib/benchpark/benchpark/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -__version__ = "0.1.0" -benchpark_version = __version__ - - -def __try_int(v): - try: - return int(v) - except ValueError: - return v - - -benchpark_version_info = tuple([__try_int(v) for v in __version__.split(".")]) - - -__all__ = ["benchpark_version_info", "benchpark_version"] -