From 58b28853e3c7c9fb3f02720b57f6598c6595e702 Mon Sep 17 00:00:00 2001 From: Ted Chambers Date: Wed, 13 Mar 2019 14:16:18 -0400 Subject: [PATCH 1/3] Bump version --- azure-devops/azure/devops/version.py | 2 +- azure-devops/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-devops/azure/devops/version.py b/azure-devops/azure/devops/version.py index b4fc0ecf..1606c863 100644 --- a/azure-devops/azure/devops/version.py +++ b/azure-devops/azure/devops/version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -VERSION = "5.0.0b3" +VERSION = "5.0.0b4" diff --git a/azure-devops/setup.py b/azure-devops/setup.py index 2ff7abe2..f3e80fa5 100644 --- a/azure-devops/setup.py +++ b/azure-devops/setup.py @@ -6,7 +6,7 @@ from setuptools import setup, find_packages NAME = "azure-devops" -VERSION = "5.0.0b3" +VERSION = "5.0.0b4" # To install the library, run the following # From d83cf9ba892c27f8ebfd1daf3875bcc5e1d65d55 Mon Sep 17 00:00:00 2001 From: Ted Chambers Date: Mon, 1 Apr 2019 13:57:32 -0400 Subject: [PATCH 2/3] Remove DeprecationWarning: Creds parameter is deprecated. Set config.credentials instead. --- azure-devops/azure/devops/connection.py | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-devops/azure/devops/connection.py b/azure-devops/azure/devops/connection.py index 04f2436b..e1e3e224 100644 --- a/azure-devops/azure/devops/connection.py +++ b/azure-devops/azure/devops/connection.py @@ -24,6 +24,7 @@ class Connection(object): def __init__(self, base_url=None, creds=None, user_agent=None): self._config = ClientConfiguration(base_url) + self._config.credentials = creds self._addition_user_agent = user_agent if user_agent is not None: self._config.add_user_agent(user_agent) From e1a5bc56cfa0366b3afe82e399c7229168fa8161 Mon Sep 17 00:00:00 2001 From: Ted Chambers Date: Wed, 3 Apr 2019 13:25:06 -0400 Subject: [PATCH 3/3] Regen for M149 --- .../azure/devops/v5_1/maven/__init__.py | 1 + .../azure/devops/v5_1/maven/models.py | 35 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/azure-devops/azure/devops/v5_1/maven/__init__.py b/azure-devops/azure/devops/v5_1/maven/__init__.py index f12bf866..e2943fda 100644 --- a/azure-devops/azure/devops/v5_1/maven/__init__.py +++ b/azure-devops/azure/devops/v5_1/maven/__init__.py @@ -38,5 +38,6 @@ 'PluginConfiguration', 'ReferenceLink', 'ReferenceLinks', + 'UpstreamSourceInfo', 'MavenClient' ] diff --git a/azure-devops/azure/devops/v5_1/maven/models.py b/azure-devops/azure/devops/v5_1/maven/models.py index 5ab02527..86d645d9 100644 --- a/azure-devops/azure/devops/v5_1/maven/models.py +++ b/azure-devops/azure/devops/v5_1/maven/models.py @@ -635,6 +635,8 @@ class Package(Model): :type name: str :param permanently_deleted_date: If and when the package was permanently deleted. :type permanently_deleted_date: datetime + :param source_chain: The history of upstream sources for this package. The first source in the list is the immediate source from which this package was saved. + :type source_chain: list of :class:`UpstreamSourceInfo ` :param version: The version of the package. :type version: str """ @@ -645,16 +647,18 @@ class Package(Model): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'permanently_deleted_date': {'key': 'permanentlyDeletedDate', 'type': 'iso-8601'}, + 'source_chain': {'key': 'sourceChain', 'type': '[UpstreamSourceInfo]'}, 'version': {'key': 'version', 'type': 'str'} } - def __init__(self, _links=None, deleted_date=None, id=None, name=None, permanently_deleted_date=None, version=None): + def __init__(self, _links=None, deleted_date=None, id=None, name=None, permanently_deleted_date=None, source_chain=None, version=None): super(Package, self).__init__() self._links = _links self.deleted_date = deleted_date self.id = id self.name = name self.permanently_deleted_date = permanently_deleted_date + self.source_chain = source_chain self.version = version @@ -731,6 +735,34 @@ def __init__(self, links=None): self.links = links +class UpstreamSourceInfo(Model): + """UpstreamSourceInfo. + + :param id: Identity of the upstream source. + :type id: str + :param location: Locator for connecting to the upstream source. + :type location: str + :param name: Display name. + :type name: str + :param source_type: Source type, such as Public or Internal. + :type source_type: object + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'source_type': {'key': 'sourceType', 'type': 'object'} + } + + def __init__(self, id=None, location=None, name=None, source_type=None): + super(UpstreamSourceInfo, self).__init__() + self.id = id + self.location = location + self.name = name + self.source_type = source_type + + class MavenPomDependency(MavenPomGav): """MavenPomDependency. @@ -813,6 +845,7 @@ def __init__(self, name=None, url=None, distribution=None): 'PluginConfiguration', 'ReferenceLink', 'ReferenceLinks', + 'UpstreamSourceInfo', 'MavenPomDependency', 'MavenPomLicense', ]