aws-parallelcluster-awsbatch-cli 1.4.0__tar.gz → 1.6.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {aws-parallelcluster-awsbatch-cli-1.4.0/src/aws_parallelcluster_awsbatch_cli.egg-info → aws_parallelcluster_awsbatch_cli-1.6.0}/PKG-INFO +16 -4
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/setup.py +4 -3
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0/src/aws_parallelcluster_awsbatch_cli.egg-info}/PKG-INFO +16 -4
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/aws_parallelcluster_awsbatch_cli.egg-info/entry_points.txt +0 -1
- aws_parallelcluster_awsbatch_cli-1.6.0/src/aws_parallelcluster_awsbatch_cli.egg-info/requires.txt +4 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/awsbhosts.py +1 -2
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/awsbout.py +6 -2
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/awsbqueues.py +1 -2
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/awsbstat.py +4 -2
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/awsbsub.py +1 -1
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/common.py +3 -3
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/utils.py +2 -2
- aws-parallelcluster-awsbatch-cli-1.4.0/src/aws_parallelcluster_awsbatch_cli.egg-info/requires.txt +0 -3
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/MANIFEST.in +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/setup.cfg +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/aws_parallelcluster_awsbatch_cli.egg-info/SOURCES.txt +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/aws_parallelcluster_awsbatch_cli.egg-info/dependency_links.txt +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/aws_parallelcluster_awsbatch_cli.egg-info/not-zip-safe +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/aws_parallelcluster_awsbatch_cli.egg-info/top_level.txt +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/__init__.py +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/awsbkill.py +0 -0
- {aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/src/awsbatch/examples/awsbatch-cli.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: aws-parallelcluster-awsbatch-cli
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.6.0
|
|
4
4
|
Summary: AWS ParallelCluster AWS Batch CLI provides a set of commands to manage AWS Batch resources created by ParallelCluster and AWS Batch jobs.
|
|
5
5
|
Home-page: https://github.com/aws/aws-parallelcluster
|
|
6
6
|
Author: Amazon Web Services
|
|
@@ -8,7 +8,6 @@ License: Apache License 2.0
|
|
|
8
8
|
Project-URL: Changelog, https://github.com/aws/aws-parallelcluster/blob/develop/awsbatch-cli/CHANGELOG.md
|
|
9
9
|
Project-URL: Issue Tracker, https://github.com/aws/aws-parallelcluster/issues
|
|
10
10
|
Project-URL: Documentation, https://docs.aws.amazon.com/parallelcluster/
|
|
11
|
-
Platform: UNKNOWN
|
|
12
11
|
Classifier: Development Status :: 5 - Production/Stable
|
|
13
12
|
Classifier: Environment :: Console
|
|
14
13
|
Classifier: Programming Language :: Python
|
|
@@ -23,6 +22,19 @@ Classifier: Topic :: Scientific/Engineering
|
|
|
23
22
|
Classifier: License :: OSI Approved :: Apache Software License
|
|
24
23
|
Requires-Python: >=3.7
|
|
25
24
|
Description-Content-Type: text/plain
|
|
25
|
+
Requires-Dist: setuptools
|
|
26
|
+
Requires-Dist: boto3>=1.39.4
|
|
27
|
+
Requires-Dist: packaging~=25.0
|
|
28
|
+
Requires-Dist: tabulate<=0.8.10,>=0.8.8
|
|
29
|
+
Dynamic: author
|
|
30
|
+
Dynamic: classifier
|
|
31
|
+
Dynamic: description
|
|
32
|
+
Dynamic: description-content-type
|
|
33
|
+
Dynamic: home-page
|
|
34
|
+
Dynamic: license
|
|
35
|
+
Dynamic: project-url
|
|
36
|
+
Dynamic: requires-dist
|
|
37
|
+
Dynamic: requires-python
|
|
38
|
+
Dynamic: summary
|
|
26
39
|
|
|
27
40
|
aws-parallelcluster-awsbatch-cli is the python package installed on the Amazon EC2 instances launched as part of AWS ParallelCluster when using AWS Batch as a scheduler. It provides a set of commands to manage AWS Batch resources created within the cluster and AWS Batch jobs.
|
|
28
|
-
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: aws-parallelcluster-awsbatch-cli
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.6.0
|
|
4
4
|
Summary: AWS ParallelCluster AWS Batch CLI provides a set of commands to manage AWS Batch resources created by ParallelCluster and AWS Batch jobs.
|
|
5
5
|
Home-page: https://github.com/aws/aws-parallelcluster
|
|
6
6
|
Author: Amazon Web Services
|
|
@@ -8,7 +8,6 @@ License: Apache License 2.0
|
|
|
8
8
|
Project-URL: Changelog, https://github.com/aws/aws-parallelcluster/blob/develop/awsbatch-cli/CHANGELOG.md
|
|
9
9
|
Project-URL: Issue Tracker, https://github.com/aws/aws-parallelcluster/issues
|
|
10
10
|
Project-URL: Documentation, https://docs.aws.amazon.com/parallelcluster/
|
|
11
|
-
Platform: UNKNOWN
|
|
12
11
|
Classifier: Development Status :: 5 - Production/Stable
|
|
13
12
|
Classifier: Environment :: Console
|
|
14
13
|
Classifier: Programming Language :: Python
|
|
@@ -23,6 +22,19 @@ Classifier: Topic :: Scientific/Engineering
|
|
|
23
22
|
Classifier: License :: OSI Approved :: Apache Software License
|
|
24
23
|
Requires-Python: >=3.7
|
|
25
24
|
Description-Content-Type: text/plain
|
|
25
|
+
Requires-Dist: setuptools
|
|
26
|
+
Requires-Dist: boto3>=1.39.4
|
|
27
|
+
Requires-Dist: packaging~=25.0
|
|
28
|
+
Requires-Dist: tabulate<=0.8.10,>=0.8.8
|
|
29
|
+
Dynamic: author
|
|
30
|
+
Dynamic: classifier
|
|
31
|
+
Dynamic: description
|
|
32
|
+
Dynamic: description-content-type
|
|
33
|
+
Dynamic: home-page
|
|
34
|
+
Dynamic: license
|
|
35
|
+
Dynamic: project-url
|
|
36
|
+
Dynamic: requires-dist
|
|
37
|
+
Dynamic: requires-python
|
|
38
|
+
Dynamic: summary
|
|
26
39
|
|
|
27
40
|
aws-parallelcluster-awsbatch-cli is the python package installed on the Amazon EC2 instances launched as part of AWS ParallelCluster when using AWS Batch as a scheduler. It provides a set of commands to manage AWS Batch resources created within the cluster and AWS Batch jobs.
|
|
28
|
-
|
|
@@ -66,7 +66,7 @@ class Host:
|
|
|
66
66
|
mem_registered,
|
|
67
67
|
cpu_avail,
|
|
68
68
|
mem_avail,
|
|
69
|
-
):
|
|
69
|
+
): # pylint: disable=too-many-positional-arguments
|
|
70
70
|
"""Initialize the object."""
|
|
71
71
|
self.container_instance_arn = container_instance_arn
|
|
72
72
|
self.status = status
|
|
@@ -185,7 +185,6 @@ class AWSBhostsCommand:
|
|
|
185
185
|
)
|
|
186
186
|
except KeyError as e:
|
|
187
187
|
fail("Error building Host item. Key (%s) not found." % e)
|
|
188
|
-
return None
|
|
189
188
|
|
|
190
189
|
@staticmethod
|
|
191
190
|
def __get_instance_attribute(attributes, attribute_name):
|
|
@@ -81,7 +81,9 @@ class AWSBoutCommand:
|
|
|
81
81
|
self.log = log
|
|
82
82
|
self.boto3_factory = boto3_factory
|
|
83
83
|
|
|
84
|
-
def run(
|
|
84
|
+
def run(
|
|
85
|
+
self, job_id, head=None, tail=None, stream=None, stream_period=None
|
|
86
|
+
): # pylint: disable=too-many-positional-arguments
|
|
85
87
|
"""Print job output."""
|
|
86
88
|
log_stream = self.__get_log_stream(job_id)
|
|
87
89
|
if log_stream:
|
|
@@ -124,7 +126,9 @@ class AWSBoutCommand:
|
|
|
124
126
|
fail("Error listing jobs from AWS Batch. Failed with exception: %s" % e)
|
|
125
127
|
return log_stream
|
|
126
128
|
|
|
127
|
-
def __print_log_stream(
|
|
129
|
+
def __print_log_stream( # noqa: C901 FIXME
|
|
130
|
+
self, log_stream, head=None, tail=None, stream=None, stream_period=None
|
|
131
|
+
): # pylint:disable=too-many-positional-arguments
|
|
128
132
|
"""
|
|
129
133
|
Ask for log stream and print it.
|
|
130
134
|
|
|
@@ -50,7 +50,7 @@ def _get_parser():
|
|
|
50
50
|
class Queue:
|
|
51
51
|
"""Generic queue object."""
|
|
52
52
|
|
|
53
|
-
def __init__(self, arn, name, priority, status, status_reason):
|
|
53
|
+
def __init__(self, arn, name, priority, status, status_reason): # pylint: disable=too-many-positional-arguments
|
|
54
54
|
"""Initialize the object."""
|
|
55
55
|
self.arn = arn
|
|
56
56
|
self.name = name
|
|
@@ -127,7 +127,6 @@ class AWSBqueuesCommand:
|
|
|
127
127
|
)
|
|
128
128
|
except KeyError as e:
|
|
129
129
|
fail("Error building Queue item. Key (%s) not found." % e)
|
|
130
|
-
return None
|
|
131
130
|
|
|
132
131
|
|
|
133
132
|
def main():
|
|
@@ -94,7 +94,7 @@ class Job:
|
|
|
94
94
|
log_stream,
|
|
95
95
|
log_stream_url,
|
|
96
96
|
s3_folder_url,
|
|
97
|
-
):
|
|
97
|
+
): # pylint: disable=too-many-positional-arguments
|
|
98
98
|
"""Initialize the object."""
|
|
99
99
|
self.id = job_id
|
|
100
100
|
self.name = name
|
|
@@ -282,7 +282,9 @@ class AWSBstatCommand:
|
|
|
282
282
|
self.boto3_factory = boto3_factory
|
|
283
283
|
self.batch_client = boto3_factory.get_client("batch")
|
|
284
284
|
|
|
285
|
-
def run(
|
|
285
|
+
def run(
|
|
286
|
+
self, job_status, expand_children, job_queue=None, job_ids=None, show_details=False
|
|
287
|
+
): # pylint: disable=too-many-positional-arguments
|
|
286
288
|
"""Print list of jobs, by filtering by queue or by ids."""
|
|
287
289
|
if job_ids:
|
|
288
290
|
self.__populate_output_by_job_ids(job_ids, show_details or len(job_ids) == 1, include_parents=True)
|
|
@@ -22,7 +22,7 @@ import boto3
|
|
|
22
22
|
from botocore.config import Config
|
|
23
23
|
from botocore.exceptions import ClientError, ParamValidationError
|
|
24
24
|
from configparser import ConfigParser, NoOptionError, NoSectionError
|
|
25
|
-
from
|
|
25
|
+
from packaging import version as packaging_version
|
|
26
26
|
from tabulate import tabulate
|
|
27
27
|
|
|
28
28
|
from awsbatch.utils import fail, get_installed_version, get_region_by_stack_id
|
|
@@ -147,8 +147,8 @@ class CliRequirementsMatcher:
|
|
|
147
147
|
"""Verify if CLI requirements are satisfied."""
|
|
148
148
|
for req in self.requirements:
|
|
149
149
|
if not self.COMPARISON_OPERATORS[req.operator](
|
|
150
|
-
|
|
151
|
-
|
|
150
|
+
packaging_version.parse(get_installed_version(req.package)),
|
|
151
|
+
packaging_version.parse(req.version),
|
|
152
152
|
):
|
|
153
153
|
fail(f"The cluster requires {req.package}{req.operator}{req.version}")
|
|
154
154
|
|
|
@@ -14,9 +14,9 @@ import pipes
|
|
|
14
14
|
import re
|
|
15
15
|
import sys
|
|
16
16
|
from datetime import datetime
|
|
17
|
+
from importlib.metadata import version as get_package_version
|
|
17
18
|
from typing import NoReturn
|
|
18
19
|
|
|
19
|
-
import pkg_resources
|
|
20
20
|
from dateutil import tz
|
|
21
21
|
|
|
22
22
|
|
|
@@ -112,7 +112,7 @@ def get_job_type(job):
|
|
|
112
112
|
|
|
113
113
|
def get_installed_version(package_name="aws-parallelcluster-awsbatch-cli"):
|
|
114
114
|
"""Get the version of the installed package."""
|
|
115
|
-
return
|
|
115
|
+
return get_package_version(package_name)
|
|
116
116
|
|
|
117
117
|
|
|
118
118
|
class S3Uploader:
|
{aws-parallelcluster-awsbatch-cli-1.4.0 → aws_parallelcluster_awsbatch_cli-1.6.0}/MANIFEST.in
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|