Skip to content

Commit eacd6a3

Browse files
tedchambtedchamb
authored
Merge pull request #93 from Microsoft/dev
Merge latest dev into master for 0.1.10
2 parents d9acb6c + 2319f39 commit eacd6a3

23 files changed

+772
-27
lines changed

‎vsts/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from setuptools import setup, find_packages
77

88
NAME = "vsts"
9-
VERSION = "0.1.9"
9+
VERSION = "0.1.10"
1010

1111
# To install the library, run the following
1212
#

‎vsts/vsts/release/v4_0/models/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
from .release_shallow_reference import ReleaseShallowReference
7474
from .release_start_metadata import ReleaseStartMetadata
7575
from .release_task import ReleaseTask
76-
from .release_trigger_base import ReleaseTriggerBase
7776
from .release_update_metadata import ReleaseUpdateMetadata
7877
from .release_work_item_ref import ReleaseWorkItemRef
7978
from .retention_policy import RetentionPolicy
@@ -156,7 +155,6 @@
156155
'ReleaseShallowReference',
157156
'ReleaseStartMetadata',
158157
'ReleaseTask',
159-
'ReleaseTriggerBase',
160158
'ReleaseUpdateMetadata',
161159
'ReleaseWorkItemRef',
162160
'RetentionPolicy',

‎vsts/vsts/release/v4_0/models/release_definition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ReleaseDefinition(Model):
5151
:param tags: Gets or sets list of tags.
5252
:type tags: list of str
5353
:param triggers: Gets or sets the list of triggers.
54-
:type triggers: list of :class:`ReleaseTriggerBase <release.v4_0.models.ReleaseTriggerBase>`
54+
:type triggers: list of :class:`object <release.v4_0.models.object>`
5555
:param url: Gets url to access the release definition.
5656
:type url: str
5757
:param variable_groups: Gets or sets the list of variable groups.
@@ -80,7 +80,7 @@ class ReleaseDefinition(Model):
8080
'revision': {'key': 'revision', 'type': 'int'},
8181
'source': {'key': 'source', 'type': 'object'},
8282
'tags': {'key': 'tags', 'type': '[str]'},
83-
'triggers': {'key': 'triggers', 'type': '[ReleaseTriggerBase]'},
83+
'triggers': {'key': 'triggers', 'type': '[object]'},
8484
'url': {'key': 'url', 'type': 'str'},
8585
'variable_groups': {'key': 'variableGroups', 'type': '[int]'},
8686
'variables': {'key': 'variables', 'type': '{ConfigurationVariableValue}'}

‎vsts/vsts/release/v4_1/models/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
from .release_start_metadata import ReleaseStartMetadata
8383
from .release_task import ReleaseTask
8484
from .release_task_attachment import ReleaseTaskAttachment
85-
from .release_trigger_base import ReleaseTriggerBase
8685
from .release_update_metadata import ReleaseUpdateMetadata
8786
from .release_work_item_ref import ReleaseWorkItemRef
8887
from .retention_policy import RetentionPolicy
@@ -174,7 +173,6 @@
174173
'ReleaseStartMetadata',
175174
'ReleaseTask',
176175
'ReleaseTaskAttachment',
177-
'ReleaseTriggerBase',
178176
'ReleaseUpdateMetadata',
179177
'ReleaseWorkItemRef',
180178
'RetentionPolicy',

‎vsts/vsts/release/v4_1/models/release_definition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ReleaseDefinition(Model):
5555
:param tags: Gets or sets list of tags.
5656
:type tags: list of str
5757
:param triggers: Gets or sets the list of triggers.
58-
:type triggers: list of :class:`ReleaseTriggerBase <release.v4_1.models.ReleaseTriggerBase>`
58+
:type triggers: list of :class:`object <release.v4_1.models.object>`
5959
:param url: Gets url to access the release definition.
6060
:type url: str
6161
:param variable_groups: Gets or sets the list of variable groups.
@@ -86,7 +86,7 @@ class ReleaseDefinition(Model):
8686
'revision': {'key': 'revision', 'type': 'int'},
8787
'source': {'key': 'source', 'type': 'object'},
8888
'tags': {'key': 'tags', 'type': '[str]'},
89-
'triggers': {'key': 'triggers', 'type': '[ReleaseTriggerBase]'},
89+
'triggers': {'key': 'triggers', 'type': '[object]'},
9090
'url': {'key': 'url', 'type': 'str'},
9191
'variable_groups': {'key': 'variableGroups', 'type': '[int]'},
9292
'variables': {'key': 'variables', 'type': '{ConfigurationVariableValue}'}

‎vsts/vsts/user/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
# Generated file, DO NOT EDIT
6+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
# --------------------------------------------------------------------------------------------

‎vsts/vsts/user/v4_1/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
# Generated file, DO NOT EDIT
6+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
# --------------------------------------------------------------------------------------------

‎vsts/vsts/user/v4_1/models/__init__.py

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
# Generated file, DO NOT EDIT
6+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
# --------------------------------------------------------------------------------------------
8+
9+
from .avatar import Avatar
10+
from .create_user_parameters import CreateUserParameters
11+
from .mail_confirmation_parameters import MailConfirmationParameters
12+
from .reference_links import ReferenceLinks
13+
from .send_user_notification_parameters import SendUserNotificationParameters
14+
from .set_user_attribute_parameters import SetUserAttributeParameters
15+
from .update_user_parameters import UpdateUserParameters
16+
from .user import User
17+
from .user_attribute import UserAttribute
18+
from .user_attributes import UserAttributes
19+
from .user_notification import UserNotification
20+
from .user_notifications import UserNotifications
21+
22+
__all__ = [
23+
'Avatar',
24+
'CreateUserParameters',
25+
'MailConfirmationParameters',
26+
'ReferenceLinks',
27+
'SendUserNotificationParameters',
28+
'SetUserAttributeParameters',
29+
'UpdateUserParameters',
30+
'User',
31+
'UserAttribute',
32+
'UserAttributes',
33+
'UserNotification',
34+
'UserNotifications',
35+
]

‎vsts/vsts/user/v4_1/models/avatar.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
# Generated file, DO NOT EDIT
6+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
# --------------------------------------------------------------------------------------------
8+
9+
from msrest.serialization import Model
10+
11+
12+
class Avatar(Model):
13+
"""Avatar.
14+
15+
:param image: The raw avatar image data, in either jpg or png format.
16+
:type image: str
17+
:param is_auto_generated: True if the avatar is dynamically generated, false if user-provided.
18+
:type is_auto_generated: bool
19+
:param last_modified: The date/time at which the avatar was last modified.
20+
:type last_modified: datetime
21+
:param size: The size of the avatar, e.g. small, medium, or large.
22+
:type size: object
23+
"""
24+
25+
_attribute_map = {
26+
'image': {'key': 'image', 'type': 'str'},
27+
'is_auto_generated': {'key': 'isAutoGenerated', 'type': 'bool'},
28+
'last_modified': {'key': 'lastModified', 'type': 'iso-8601'},
29+
'size': {'key': 'size', 'type': 'object'}
30+
}
31+
32+
def __init__(self, image=None, is_auto_generated=None, last_modified=None, size=None):
33+
super(Avatar, self).__init__()
34+
self.image = image
35+
self.is_auto_generated = is_auto_generated
36+
self.last_modified = last_modified
37+
self.size = size

‎vsts/vsts/user/v4_1/models/create_user_parameters.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
# Generated file, DO NOT EDIT
6+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
# --------------------------------------------------------------------------------------------
8+
9+
from msrest.serialization import Model
10+
11+
12+
class CreateUserParameters(Model):
13+
"""CreateUserParameters.
14+
15+
:param country: The user's country of residence or association.
16+
:type country: str
17+
:param data:
18+
:type data: dict
19+
:param descriptor: The user's unique identifier, and the primary means by which the user is referenced.
20+
:type descriptor: :class:`str <user.v4_1.models.str>`
21+
:param display_name: The user's name, as displayed throughout the product.
22+
:type display_name: str
23+
:param mail: The user's preferred email address.
24+
:type mail: str
25+
:param region: The region in which the user resides or is associated.
26+
:type region: str
27+
"""
28+
29+
_attribute_map = {
30+
'country': {'key': 'country', 'type': 'str'},
31+
'data': {'key': 'data', 'type': '{object}'},
32+
'descriptor': {'key': 'descriptor', 'type': 'str'},
33+
'display_name': {'key': 'displayName', 'type': 'str'},
34+
'mail': {'key': 'mail', 'type': 'str'},
35+
'region': {'key': 'region', 'type': 'str'}
36+
}
37+
38+
def __init__(self, country=None, data=None, descriptor=None, display_name=None, mail=None, region=None):
39+
super(CreateUserParameters, self).__init__()
40+
self.country = country
41+
self.data = data
42+
self.descriptor = descriptor
43+
self.display_name = display_name
44+
self.mail = mail
45+
self.region = region

0 commit comments

Comments
 (0)