Skip to content

Commit

Permalink
Fix style errors in spack-stack extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
climbfuji committed Oct 3, 2023
1 parent e7b797a commit 5ef344f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
14 changes: 4 additions & 10 deletions lib/jcsda-emc/spack-stack/stack/cmd/stack_cmds/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,23 +81,17 @@ def setup_common_parser_args(subparser):
def setup_ctr_parser(subparser):
"""create container-specific parsing options"""

subparser.add_argument("--container",
required=True,
help=container_config_help()
)
subparser.add_argument("--container", required=True, help=container_config_help())

subparser.add_argument("--specs",
required=True,
help=container_specs_help()
)
subparser.add_argument("--specs", required=True, help=container_specs_help())

subparser.add_argument(
"--dir",
type=str,
required=False,
default=default_env_path,
help="Environment will be placed in <dir>/container/."
" Default is {}/container/.".format(default_env_path)
" Default is {}/container/.".format(default_env_path),
)

setup_common_parser_args(subparser)
Expand All @@ -121,7 +115,7 @@ def setup_env_parser(subparser):
type=str,
required=False,
default=None,
help='Environment name, defaults to <template>.<site>',
help="Environment name, defaults to <template>.<site>",
)

subparser.add_argument(
Expand Down
10 changes: 3 additions & 7 deletions lib/jcsda-emc/spack-stack/stack/container_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

import spack
import spack.util.spack_yaml as syaml
from spack.extensions.stack.stack_paths import (
common_path,
container_path,
container_specs_path,
)
from spack.extensions.stack.stack_paths import common_path, container_path, container_specs_path


class StackContainer:
Expand Down Expand Up @@ -45,8 +41,8 @@ def write(self):
"""Merge base packages and app's spack.yaml into
output container file.
"""
#template_env = os.path.join(self.template_path, "spack.yaml")
#with open(template_env, "r") as f:
# template_env = os.path.join(self.template_path, "spack.yaml")
# with open(template_env, "r") as f:
# # Spack uses :: to override settings.
# # but it's not understood when used in a spack.yaml
# filedata = f.read()
Expand Down

0 comments on commit 5ef344f

Please sign in to comment.