Skip to content

Commit c5a1ec2

Browse files
committed
Apply isort to ramble files
1 parent 7ddec49 commit c5a1ec2

File tree

231 files changed

+626
-703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+626
-703
lines changed

lib/ramble/docs/conf.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@
1111
import sys
1212
from glob import glob
1313

14+
import pkg_resources
1415
from docutils.statemachine import StringList
15-
from sphinx.domains.python import PythonDomain
16-
from sphinx.ext.apidoc import main as sphinx_apidoc
17-
from sphinx.parsers import RSTParser
1816

1917
# The name of the Pygments (syntax highlighting) style to use.
2018
# We use our own extension of the default style with a few modifications
2119
from pygments.styles.default import DefaultStyle
2220
from pygments.token import Generic
23-
24-
import pkg_resources
21+
from sphinx.domains.python import PythonDomain
22+
from sphinx.ext.apidoc import main as sphinx_apidoc
23+
from sphinx.parsers import RSTParser
2524

2625
# -- Ramble customizations -----------------------------------------------------
2726
# If extensions (or modules to document with autodoc) are in another directory,

lib/ramble/ramble/appkit.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,22 @@
1515
import llnl.util.filesystem
1616
from llnl.util.filesystem import *
1717

18+
import ramble.language.application_language
1819
from ramble.application import ApplicationBase
1920
from ramble.application_types.executable import ExecutableApplication
20-
from ramble.spec import Spec
21-
22-
import ramble.language.application_language
2321
from ramble.language.application_language import *
2422
from ramble.language.shared_language import *
25-
from ramble.util.logger import logger
26-
27-
# Import new logger as tty to preserve old behavior
28-
from ramble.util.logger import logger as tty
29-
30-
from ramble.util.file_util import get_file_path
31-
from ramble.util.foms import FomType
32-
33-
from ramble.util.output_capture import OUTPUT_CAPTURE
34-
23+
from ramble.spec import Spec
3524
from ramble.util.command_runner import (
3625
CommandRunner,
37-
RunnerError,
3826
NoPathRunnerError,
27+
RunnerError,
3928
ValidationFailedError,
4029
)
30+
from ramble.util.file_util import get_file_path
31+
from ramble.util.foms import FomType
32+
33+
# Import new logger as tty to preserve old behavior
34+
from ramble.util.logger import logger
35+
from ramble.util.logger import logger as tty
36+
from ramble.util.output_capture import OUTPUT_CAPTURE

lib/ramble/ramble/application.py

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,61 @@
77
# except according to those terms.
88
"""Define base classes for application definitions"""
99

10+
import fnmatch
1011
import io
12+
import operator
1113
import os
12-
import stat
1314
import re
14-
import textwrap
15-
import string
1615
import shutil
17-
import fnmatch
16+
import stat
17+
import string
18+
import textwrap
1819
import time
19-
import operator
20+
from enum import Enum
2021
from typing import List
2122

2223
import llnl.util.filesystem as fs
2324
import llnl.util.tty.color as color
2425

25-
import spack.util.executable
26-
import spack.util.spack_json
27-
import spack.util.environment
28-
import spack.util.compression
29-
3026
import ramble.config
31-
import ramble.graphs
32-
import ramble.stage
33-
import ramble.mirror
34-
import ramble.fetch_strategy
3527
import ramble.expander
28+
import ramble.fetch_strategy
29+
import ramble.graphs
3630
import ramble.keywords
37-
import ramble.repeats
38-
import ramble.repository
31+
import ramble.mirror
3932
import ramble.modifier
4033
import ramble.modifier_types.disabled
41-
import ramble.success_criteria
42-
import ramble.workflow_manager
4334
import ramble.paths
44-
import ramble.util.executable
35+
import ramble.repeats
36+
import ramble.repository
37+
import ramble.stage
38+
import ramble.success_criteria
39+
import ramble.util.class_attributes
4540
import ramble.util.colors as rucolor
46-
import ramble.util.hashing
47-
import ramble.util.env
4841
import ramble.util.directives
49-
import ramble.util.stats
42+
import ramble.util.env
43+
import ramble.util.executable
5044
import ramble.util.graph
51-
import ramble.util.class_attributes
52-
import ramble.util.path
45+
import ramble.util.hashing
5346
import ramble.util.lock as lk
54-
from ramble.util.foms import FomType
55-
from ramble.util.logger import logger
56-
from ramble.util.shell_utils import source_str
57-
from ramble.util.naming import NS_SEPARATOR
58-
59-
from ramble.workspace import namespace
47+
import ramble.util.path
48+
import ramble.util.stats
49+
import ramble.workflow_manager
50+
from ramble.error import RambleError
6051
from ramble.experiment_result import ExperimentResult
61-
6252
from ramble.language.application_language import ApplicationMeta
6353
from ramble.language.shared_language import SharedMeta, register_builtin, register_phase
64-
from ramble.error import RambleError
54+
from ramble.util.foms import FomType
55+
from ramble.util.logger import logger
56+
from ramble.util.naming import NS_SEPARATOR
6557
from ramble.util.output_capture import output_mapper
58+
from ramble.util.shell_utils import source_str
59+
from ramble.workspace import namespace
6660

67-
from enum import Enum
61+
import spack.util.compression
62+
import spack.util.environment
63+
import spack.util.executable
64+
import spack.util.spack_json
6865

6966
experiment_status = Enum(
7067
"experiment_status",

lib/ramble/ramble/caches.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
from llnl.util.filesystem import mkdirp
1414
from llnl.util.symlink import symlink
1515

16+
import ramble.config
1617
import ramble.error
1718
import ramble.paths
18-
import ramble.config
1919
import ramble.util.file_cache
2020
import ramble.util.path
2121

lib/ramble/ramble/cmd/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
# except according to those terms.
88

99

10+
import argparse
1011
import os
1112
import re
12-
import argparse
13+
1314
import ruamel.yaml as yaml
15+
from ruamel.yaml.error import MarkedYAMLError
1416

15-
from llnl.util.lang import attr_setdefault
1617
from llnl.util.filesystem import join_path
18+
from llnl.util.lang import attr_setdefault
1719

1820
import ramble.config
1921
import ramble.error
2022
import ramble.paths
2123
import ramble.workspace
22-
from ramble.util.logger import logger
2324
from ramble.error import RambleCommandError
25+
from ramble.util.logger import logger
2426

2527
import spack.extensions
2628
import spack.util.string
2729

28-
from ruamel.yaml.error import MarkedYAMLError
29-
3030
# cmd has a submodule called "list" so preserve the python list module
3131
python_list = list
3232

lib/ramble/ramble/cmd/clean.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
import shutil
1313

1414
import llnl.util.tty as tty
15-
import spack.util.spack_yaml as syaml
1615

1716
import ramble.caches
1817
import ramble.config
19-
import ramble.repository
2018
import ramble.reports
19+
import ramble.repository
2120
import ramble.stage
22-
from ramble.util.logger import logger
2321
from ramble.paths import lib_path, var_path
22+
from ramble.util.logger import logger
23+
24+
import spack.util.spack_yaml as syaml
2425

2526
description = "remove temporary files and/or downloaded archives"
2627
section = "cleanup"

lib/ramble/ramble/cmd/commands.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
import sys
1515

1616
import llnl.util.filesystem as fs
17-
from llnl.util.argparsewriter import ArgparseWriter, ArgparseRstWriter, ArgparseCompletionWriter
17+
from llnl.util.argparsewriter import ArgparseCompletionWriter, ArgparseRstWriter, ArgparseWriter
1818
from llnl.util.tty.colify import colify
1919

2020
import ramble.cmd
2121
import ramble.main
2222
import ramble.paths
23-
from ramble.util.logger import logger
2423
from ramble.main import section_descriptions
25-
24+
from ramble.util.logger import logger
2625

2726
description = "list available ramble commands"
2827
section = "developer"

lib/ramble/ramble/cmd/common/arguments.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
import argparse
1111
import inspect
1212

13-
from spack.util.pattern import Args
1413
from ramble.util.logger import logger
1514

15+
from spack.util.pattern import Args
16+
1617
__all__ = ["add_common_arguments", "allows_unknown_args", "validate_unknown_args"]
1718

1819
#: dictionary of argument-generating functions, keyed by name
@@ -101,7 +102,7 @@ def specs():
101102

102103
@arg
103104
def obj_type():
104-
from ramble.repository import default_type, OBJECT_NAMES
105+
from ramble.repository import OBJECT_NAMES, default_type
105106

106107
return Args(
107108
"--type",
@@ -113,7 +114,7 @@ def obj_type():
113114

114115
@arg
115116
def repo_type():
116-
from ramble.repository import default_type, OBJECT_NAMES
117+
from ramble.repository import OBJECT_NAMES, default_type
117118

118119
return Args(
119120
"-t",

lib/ramble/ramble/cmd/common/info.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@
66
# option. This file may not be copied, modified, or distributed
77
# except according to those terms.
88

9+
import enum
910
import fnmatch
1011

1112
import llnl.util.tty.color as color
1213
from llnl.util.tty.colify import colified
1314

14-
import ramble.util.colors
1515
import ramble.cmd.common.arguments as arguments
1616
import ramble.repository
17-
17+
import ramble.util.colors
1818
from ramble.util.logger import logger
1919
from ramble.workload import WorkloadVariable
2020

21-
import enum
22-
2321
supported_formats = enum.Enum("formats", ["text", "lists"])
2422

2523
obj_attribute_map = {

lib/ramble/ramble/cmd/common/list.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@
99

1010
import argparse
1111
import fnmatch
12+
import math
1213
import os
1314
import re
1415
import sys
15-
import math
16+
from html import escape # novm
1617

1718
from llnl.util.tty.colify import colify
1819

19-
import ramble.repository
2020
import ramble.cmd.common.arguments as arguments
21+
import ramble.repository
2122
from ramble.util.logger import logger
2223

23-
from html import escape # novm
24-
25-
2624
formatters = {}
2725

2826

lib/ramble/ramble/cmd/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import ramble.cmd.common.arguments
1818
import ramble.config
19+
import ramble.util.editor
1920
import ramble.workspace
2021
from ramble.util.logger import logger
2122

2223
import spack.util.spack_yaml as syaml
23-
import ramble.util.editor
2424

2525
description = "get and set configuration options"
2626
section = "config"

lib/ramble/ramble/cmd/deployment.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,21 @@
1010

1111
import llnl.util.filesystem as fs
1212

13-
import spack.util.spack_json as sjson
14-
import spack.util.url as surl
15-
1613
import ramble.cmd
1714
import ramble.cmd.common.arguments as arguments
18-
19-
import ramble.fetch_strategy
2015
import ramble.config
16+
import ramble.fetch_strategy
17+
import ramble.filters
18+
import ramble.pipeline
2119
import ramble.stage
20+
import ramble.util.path
2221
import ramble.workspace
2322
import ramble.workspace.shell
24-
import ramble.pipeline
25-
import ramble.filters
2623
from ramble.main import RambleCommand
27-
import ramble.util.path
28-
2924
from ramble.util.logger import logger
3025

26+
import spack.util.spack_json as sjson
27+
import spack.util.url as surl
3128

3229
description = "(experimental) manage workspace deployments"
3330
section = "workspaces"

lib/ramble/ramble/cmd/help.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# except according to those terms.
88

99
import sys
10+
1011
from llnl.util.tty.color import colorize
1112

1213
description = "get help on ramble and its commands"

lib/ramble/ramble/cmd/info.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import ramble.cmd.common.info
1010
import ramble.repository
1111

12-
1312
description = "get detailed information on a particular object"
1413
section = "basic"
1514
level = "short"

lib/ramble/ramble/cmd/license.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
# option. This file may not be copied, modified, or distributed
77
# except according to those terms.
88

9-
from datetime import datetime, timezone
109
import os
1110
import re
1211
from collections import defaultdict
12+
from datetime import datetime, timezone
1313

1414
import ramble.paths
15+
import ramble.repository
1516
from ramble.util.logger import logger
17+
1618
from spack.util.executable import which
17-
import ramble.repository
1819

1920
description = "list and check license headers on files in ramble"
2021
section = "developer"

0 commit comments

Comments
 (0)