Hello community,
here is the log from the commit of package azure-cli-batch for openSUSE:Factory
checked in at 2019-05-22 10:58:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/azure-cli-batch (Old)
and /work/SRC/openSUSE:Factory/.azure-cli-batch.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "azure-cli-batch"
Wed May 22 10:58:50 2019 rev:5 rq:696816 version:3.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/azure-cli-batch/azure-cli-batch.changes
2018-10-15 10:48:21.183075281 +0200
+++
/work/SRC/openSUSE:Factory/.azure-cli-batch.new.5148/azure-cli-batch.changes
2019-05-22 10:58:53.518854876 +0200
@@ -1,0 +2,16 @@
+Tue Apr 16 12:47:47 UTC 2019 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- New upstream release
+ + Version 3.4.1
+ + For detailed information about changes see the
+ HISTORY.txt file provided with this package
+- Bump minimum version for Python Azure SDK namespace
+ packages to 3.0.0 in BuildRequires and Requires
+- Remove python3-devel package from BuildRequires
+- Remove unzip package from BuildRequires
+- Run fdupes to hardlink duplicate files
+ + Add fdupes to BuildRequires
+ + Add %fdupes invocation to %install
+- Update Requires from setup.py
+
+-------------------------------------------------------------------
Old:
----
azure-cli-batch-3.3.3.tar.gz
New:
----
azure-cli-batch-3.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ azure-cli-batch.spec ++++++
--- /var/tmp/diff_new_pack.gMbO4N/_old 2019-05-22 10:58:54.098854125 +0200
+++ /var/tmp/diff_new_pack.gMbO4N/_new 2019-05-22 10:58:54.102854120 +0200
@@ -1,7 +1,7 @@
#
# spec file for package azure-cli-batch
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: azure-cli-batch
-Version: 3.3.3
+Version: 3.4.1
Release: 0
Summary: Microsoft Azure CLI 'batch' Command Module
License: MIT
@@ -27,17 +27,16 @@
Source1: LICENSE.txt
BuildRequires: azure-cli-command-modules-nspkg
BuildRequires: azure-cli-nspkg
-BuildRequires: python3-azure-nspkg
-BuildRequires: python3-devel
+BuildRequires: fdupes
+BuildRequires: python3-azure-nspkg >= 3.0.0
BuildRequires: python3-setuptools
-BuildRequires: unzip
Requires: azure-cli-command-modules-nspkg
Requires: azure-cli-core
Requires: azure-cli-nspkg
-Requires: python3-azure-batch >= 4.1.3
+Requires: python3-azure-batch >= 5.1.0
Requires: python3-azure-mgmt-batch >= 5.0.1
Requires: python3-azure-mgmt-keyvault >= 1.1.0
-Requires: python3-azure-nspkg
+Requires: python3-azure-nspkg >= 3.0.0
Conflicts: azure-cli < 2.0.0
BuildArch: noarch
@@ -57,6 +56,7 @@
%install
python3 setup.py install --root=%{buildroot} --prefix=%{_prefix}
--install-lib=%{python3_sitelib}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
rm -rf %{buildroot}%{python3_sitelib}/azure/cli/command_modules/__init__.*
rm -rf %{buildroot}%{python3_sitelib}/azure/cli/command_modules/__pycache__
rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__init__.*
++++++ azure-cli-batch-3.3.3.tar.gz -> azure-cli-batch-3.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/azure-cli-batch-3.3.3/HISTORY.rst
new/azure-cli-batch-3.4.1/HISTORY.rst
--- old/azure-cli-batch-3.3.3/HISTORY.rst 2018-08-23 01:07:57.000000000
+0200
+++ new/azure-cli-batch-3.4.1/HISTORY.rst 2018-10-18 21:46:28.000000000
+0200
@@ -3,6 +3,21 @@
Release History
===============
+3.4.1
++++++
+* Updated to Batch SDK 5.1.0.
+
+3.4.0
++++++
+* Updated to Batch SDK 5.0.0.
+
+3.3.4
++++++
+* Update adding tasks through --json-file to support
AddTaskCollectionParameter syntax
+* Update documentation of accepted --json-file formats
+* Add --max-tasks-per-node-option to az batch pool create
+* Update show behavior of az batch account to show currently logged in account
if no options are specified.
+
3.3.3
+++++
* Update Batch Management SDK dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/azure-cli-batch-3.3.3/PKG-INFO
new/azure-cli-batch-3.4.1/PKG-INFO
--- old/azure-cli-batch-3.3.3/PKG-INFO 2018-08-23 01:10:04.000000000 +0200
+++ new/azure-cli-batch-3.4.1/PKG-INFO 2018-10-18 21:47:09.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: azure-cli-batch
-Version: 3.3.3
+Version: 3.4.1
Summary: Microsoft Azure Command-Line Tools Batch Command Module
Home-page: https://github.com/Azure/azure-cli
Author: Microsoft Corporation
@@ -20,6 +20,21 @@
Release History
===============
+ 3.4.1
+ +++++
+ * Updated to Batch SDK 5.1.0.
+
+ 3.4.0
+ +++++
+ * Updated to Batch SDK 5.0.0.
+
+ 3.3.4
+ +++++
+ * Update adding tasks through --json-file to support
AddTaskCollectionParameter syntax
+ * Update documentation of accepted --json-file formats
+ * Add --max-tasks-per-node-option to az batch pool create
+ * Update show behavior of az batch account to show currently logged in
account if no options are specified.
+
3.3.3
+++++
* Update Batch Management SDK dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_command_type.py
new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_command_type.py
--- old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_command_type.py
2018-08-23 01:07:57.000000000 +0200
+++ new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_command_type.py
2018-10-18 21:46:28.000000000 +0200
@@ -766,7 +766,8 @@
for flattened_arg in self.parser.compile_args():
args.append(flattened_arg)
param = 'json_file'
- docstring = "A file containing the {} specification in JSON
format. " \
+ docstring = "A file containing the {} specification in JSON " \
+ "(formatted to match the respective REST API
body). " \
"If this parameter is specified, all '{}
Arguments'" \
" are ignored.".format(arg[0].replace('_', ' '),
group_title(arg[0]))
args.append((param, CLICommandArgument(param,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_help.py
new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_help.py
--- old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_help.py
2018-08-23 01:07:57.000000000 +0200
+++ new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_help.py
2018-10-18 21:46:28.000000000 +0200
@@ -47,6 +47,11 @@
short-summary: Log in to a Batch account through Azure Active Directory or
Shared Key authentication.
"""
+helps['batch account show'] = """
+ type: command
+ short-summary: Get a specified Batch account or the currently set account.
+"""
+
helps['batch application'] = """
type: group
short-summary: Manage Batch applications.
@@ -73,6 +78,7 @@
long-summary: This step is unnecessary if the package has already been
successfully activated by the `create` command.
"""
+
helps['batch application summary'] = """
type: group
short-summary: View a summary of Batch application packages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_parameter_format.py
new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_parameter_format.py
---
old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_parameter_format.py
2018-08-23 01:07:57.000000000 +0200
+++
new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_parameter_format.py
2018-10-18 21:46:28.000000000 +0200
@@ -66,7 +66,6 @@
'job_release_task',
'auto_pool_specification',
'on_task_failure',
- 'max_tasks_per_node',
'job.on_all_tasks_complete',
'job_manager_task.kill_job_on_completion',
'job_manager_task.run_exclusive',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_params.py
new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_params.py
--- old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/_params.py
2018-08-23 01:07:57.000000000 +0200
+++ new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/_params.py
2018-10-18 21:46:28.000000000 +0200
@@ -8,8 +8,7 @@
from knack.arguments import CLIArgumentType
from azure.mgmt.batch.models import AccountKeyType
-from azure.batch.models.batch_service_client_enums import \
- (ComputeNodeDeallocationOption)
+from azure.batch.models import ComputeNodeDeallocationOption
from azure.cli.core.commands.parameters import \
(tags_type, get_location_type, resource_group_name_type,
@@ -38,6 +37,10 @@
with self.argument_context('batch account') as c:
c.argument('account_name', batch_name_type, options_list=('--name',
'-n'))
+ with self.argument_context('batch account show') as c:
+ c.argument('resource_group_name', resource_group_name_type, help='Name
of the resource group. If not specified will display currently set account.',
required=False)
+ c.argument('account_name', batch_name_type, options_list=('--name',
'-n'), help='Name of the batch account to show. If not specified will display
currently set account.', required=False)
+
with self.argument_context('batch account list') as c:
c.argument('resource_group_name', resource_group_name_type, help='Name
of the resource group', required=False)
@@ -90,7 +93,7 @@
# TODO: Refactor so the help text can be extracted automatically
with self.argument_context('batch pool reset') as c:
- c.argument('json_file', type=file_type, help='The file containing pool
update properties parameter specification in JSON format. If this parameter is
specified, all \'Pool Update Properties Parameter Arguments\' are ignored.',
validator=validate_json_file, completer=FilesCompleter())
+ c.argument('json_file', type=file_type, help='The file containing pool
update properties parameter specification in JSON(formatted to match REST API
request body). If this parameter is specified, all \'Pool Update Properties
Parameter Arguments\' are ignored.', validator=validate_json_file,
completer=FilesCompleter())
c.argument('pool_id', help='The ID of the pool to update.')
c.argument('application_package_references', nargs='+',
type=application_package_reference_format, arg_group='Pool')
c.argument('certificate_references', nargs='+',
type=certificate_reference_format, arg_group='Pool')
@@ -130,7 +133,7 @@
c.argument('thumbprint', help='The certificate thumbprint.',
validator=validate_cert_settings)
with self.argument_context('batch task create') as c:
- c.argument('json_file', type=file_type, help='The file containing the
task(s) to create in JSON format, if this parameter is specified, all other
parameters are ignored.', validator=validate_json_file,
completer=FilesCompleter())
+ c.argument('json_file', type=file_type, help='The file containing the
task(s) to create in JSON(formatted to match REST API request body). When
submitting multiple tasks, accepts either an array of tasks or a
TaskAddCollectionParamater. If this parameter is specified, all other
parameters are ignored.', validator=validate_json_file,
completer=FilesCompleter())
c.argument('application_package_references', nargs='+', help='The
space-separated list of IDs specifying the application packages to be
installed. Space-separated application IDs with optional version in
\'id[#version]\' format.', type=application_package_reference_format)
c.argument('job_id', help='The ID of the job containing the task.')
c.argument('task_id', help='The ID of the task.')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/commands.py
new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/commands.py
--- old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/commands.py
2018-08-23 01:07:57.000000000 +0200
+++ new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/commands.py
2018-10-18 21:46:28.000000000 +0200
@@ -51,7 +51,7 @@
# Mgmt Account Operations
with self.command_group('batch account', get_mgmt_type('batch_account'),
client_factory=get_mgmt_factory('batch_account')) as g:
g.custom_command('list', 'list_accounts',
table_transformer=account_list_table_format)
- g.show_command('show', 'get')
+ g.custom_command('show', 'get_account')
g.custom_command('create', 'create_account', supports_no_wait=True)
g.custom_command('set', 'update_account')
g.command('delete', 'delete', supports_no_wait=True, confirmation=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/custom.py
new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/custom.py
--- old/azure-cli-batch-3.3.3/azure/cli/command_modules/batch/custom.py
2018-08-23 01:07:57.000000000 +0200
+++ new/azure-cli-batch-3.4.1/azure/cli/command_modules/batch/custom.py
2018-10-18 21:46:28.000000000 +0200
@@ -18,8 +18,8 @@
from azure.batch.models import (CertificateAddParameter,
PoolStopResizeOptions, PoolResizeParameter,
PoolResizeOptions, JobListOptions,
JobListFromJobScheduleOptions,
- TaskAddParameter, TaskConstraints,
PoolUpdatePropertiesParameter,
- StartTask, AffinityInformation)
+ TaskAddParameter, TaskAddCollectionParameter,
TaskConstraints,
+ PoolUpdatePropertiesParameter, StartTask,
AffinityInformation)
from azure.cli.core.commands.client_factory import get_mgmt_service_client
from azure.cli.core.profiles import get_sdk, ResourceType
@@ -41,13 +41,29 @@
# Mgmt custom commands
-
def list_accounts(client, resource_group_name=None):
acct_list =
client.list_by_resource_group(resource_group_name=resource_group_name) \
if resource_group_name else client.list()
return list(acct_list)
+def get_account(cmd, client, resource_group_name=None, account_name=None):
+ if resource_group_name and account_name:
+ return client.get(resource_group_name, account_name)
+ else:
+ account_endpoint = cmd.cli_ctx.config.get('batch', 'endpoint')
+ if not account_endpoint:
+ raise ValueError(
+ "Missing required arguments. Either specify
--resource-group-name and "
+ "--account-name or must be logged into a batch account")
+ account_list = list_accounts(client)
+ for account in account_list:
+ if account.account_endpoint in account_endpoint:
+ return account
+ raise ValueError("Missing required arguments. Either specify
--resource-group-name and "
+ "--account-name or must be logged into a batch account")
+
+
@transfer_doc(AutoStorageBaseProperties)
def create_account(client,
resource_group_name, account_name, location, tags=None,
storage_account=None,
@@ -106,6 +122,8 @@
profile = Profile(cli_ctx=cmd.cli_ctx)
creds, subscription, tenant =
profile.get_raw_token(resource=resource)
return {
+ 'account': account.name,
+ 'endpoint': 'https://{}/'.format(account.account_endpoint),
'tokenType': creds[0],
'accessToken': creds[1],
'expiresOn': creds[2]['expiresOn'],
@@ -185,9 +203,12 @@
with open(certificate_file, "rb") as f:
data_bytes = f.read()
data = base64.b64encode(data_bytes).decode('utf-8')
- cert = CertificateAddParameter(thumbprint, thumbprint_algorithm, data,
- certificate_format=certificate_format,
- password=password)
+ cert = CertificateAddParameter(
+ thumbprint=thumbprint,
+ thumbprint_algorithm=thumbprint_algorithm,
+ data=data,
+ certificate_format=certificate_format,
+ password=password)
client.add(cert)
return client.get(thumbprint_algorithm, thumbprint)
@@ -251,12 +272,13 @@
metadata = []
if application_package_references is None:
application_package_references = []
- param = PoolUpdatePropertiesParameter(certificate_references,
- application_package_references,
- metadata)
+ param = PoolUpdatePropertiesParameter(
+ certificate_references=certificate_references,
+ application_package_references=application_package_references,
+ metadata=metadata)
if start_task_command_line:
- param.start_task = StartTask(start_task_command_line,
+ param.start_task = StartTask(command_line=start_task_command_line,
environment_settings=start_task_environment_settings,
wait_for_success=start_task_wait_for_success,
max_task_retry_count=start_task_max_task_retry_count)
@@ -272,7 +294,6 @@
expand=expand)
return
list(client.list_from_job_schedule(job_schedule_id=job_schedule_id,
job_list_from_job_schedule_options=option1))
-
option2 = JobListOptions(filter=filter,
select=select,
expand=expand)
@@ -291,22 +312,27 @@
json_obj = get_file_json(json_file)
try:
task = TaskAddParameter.from_dict(json_obj)
- except DeserializationError:
- tasks = []
+ except (DeserializationError, TypeError):
try:
- for json_task in json_obj:
- tasks.append(TaskAddParameter.from_dict(json_task))
+ task_collection =
TaskAddCollectionParameter.from_dict(json_obj)
+ tasks = task_collection.value
except (DeserializationError, TypeError):
- raise ValueError("JSON file '{}' is not formatted
correctly.".format(json_file))
+ try:
+ for json_task in json_obj:
+ tasks.append(TaskAddParameter.from_dict(json_task))
+ except (DeserializationError, TypeError):
+ raise ValueError("JSON file '{}' is not formatted
correctly.".format(json_file))
else:
if command_line is None or task_id is None:
raise ValueError("Missing required arguments.\nEither --json-file,
"
"or both --task-id and --command-line must be
specified.")
- task = TaskAddParameter(task_id, command_line,
- resource_files=resource_files,
- environment_settings=environment_settings,
- affinity_info=AffinityInformation(affinity_id)
if affinity_id else None,
-
application_package_references=application_package_references)
+ task = TaskAddParameter(
+ id=task_id,
+ command_line=command_line,
+ resource_files=resource_files,
+ environment_settings=environment_settings,
+ affinity_info=AffinityInformation(affinity_id=affinity_id) if
affinity_id else None,
+ application_package_references=application_package_references)
if max_wall_clock_time is not None or retention_time is not None \
or max_task_retry_count is not None:
task.constraints =
TaskConstraints(max_wall_clock_time=max_wall_clock_time,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure_cli_batch.egg-info/PKG-INFO
new/azure-cli-batch-3.4.1/azure_cli_batch.egg-info/PKG-INFO
--- old/azure-cli-batch-3.3.3/azure_cli_batch.egg-info/PKG-INFO 2018-08-23
01:10:04.000000000 +0200
+++ new/azure-cli-batch-3.4.1/azure_cli_batch.egg-info/PKG-INFO 2018-10-18
21:47:09.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: azure-cli-batch
-Version: 3.3.3
+Version: 3.4.1
Summary: Microsoft Azure Command-Line Tools Batch Command Module
Home-page: https://github.com/Azure/azure-cli
Author: Microsoft Corporation
@@ -20,6 +20,21 @@
Release History
===============
+ 3.4.1
+ +++++
+ * Updated to Batch SDK 5.1.0.
+
+ 3.4.0
+ +++++
+ * Updated to Batch SDK 5.0.0.
+
+ 3.3.4
+ +++++
+ * Update adding tasks through --json-file to support
AddTaskCollectionParameter syntax
+ * Update documentation of accepted --json-file formats
+ * Add --max-tasks-per-node-option to az batch pool create
+ * Update show behavior of az batch account to show currently logged in
account if no options are specified.
+
3.3.3
+++++
* Update Batch Management SDK dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/azure-cli-batch-3.3.3/azure_cli_batch.egg-info/requires.txt
new/azure-cli-batch-3.4.1/azure_cli_batch.egg-info/requires.txt
--- old/azure-cli-batch-3.3.3/azure_cli_batch.egg-info/requires.txt
2018-08-23 01:10:04.000000000 +0200
+++ new/azure-cli-batch-3.4.1/azure_cli_batch.egg-info/requires.txt
2018-10-18 21:47:09.000000000 +0200
@@ -1,4 +1,4 @@
-azure-batch==4.1.3
+azure-batch==5.1.0
azure-mgmt-batch==5.0.1
azure-mgmt-keyvault==1.1.0
azure-cli-core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/azure-cli-batch-3.3.3/setup.py
new/azure-cli-batch-3.4.1/setup.py
--- old/azure-cli-batch-3.3.3/setup.py 2018-08-23 01:07:57.000000000 +0200
+++ new/azure-cli-batch-3.4.1/setup.py 2018-10-18 21:46:28.000000000 +0200
@@ -15,7 +15,7 @@
logger.warn("Wheel is not available, disabling bdist_wheel hook")
cmdclass = {}
-VERSION = "3.3.3"
+VERSION = "3.4.1"
# The full list of classifiers is available at
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
CLASSIFIERS = [
@@ -33,7 +33,7 @@
]
DEPENDENCIES = [
- 'azure-batch==4.1.3',
+ 'azure-batch==5.1.0',
'azure-mgmt-batch==5.0.1',
'azure-mgmt-keyvault==1.1.0',
'azure-cli-core'
