Skip to content

Setting default location in workspace calls if not specified #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ricardo-espinoza merged 5 commits into from
Jan 4, 2021
Merged

Setting default location in workspace calls if not specified #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a9f7b8
Setting default location in workspace calls if not specified.
ricardo-espinoza Dec 16, 2020
e192438
Updating version number and history
ricardo-espinoza Dec 16, 2020
d0f1217
Fixing order of change log
ricardo-espinoza Dec 16, 2020
03a5ec8
Rename test classes to avoid duplicate names
ricardo-espinoza Dec 18, 2020
c00344c
Update test recordings
ricardo-espinoza Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/quantum/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
Release History
===============

0.11.2906.2
0.14.2012.1501
++++++
* Initial release. Version intended to work with Azure Quantum Private Preview
and with QDK version 0.11.2906.*
* Updating multi-region in data plane REST API
* Aligned to QDK 0.14.2011120240.

0.13.2011.1901
++++++
* Adding methods for creating and deleting workspaces.
* Note: Setting providers from the CLI is not supported.
* Aligned to QDK 0.13.20111004.

0.14.2012.701
++++++
* Updating multi-region in data plane REST API
* Aligned to QDK 0.14.2011120240.

0.11.2906.2
++++++
* Initial release. Version intended to work with Azure Quantum Private Preview
and with QDK version 0.11.2906.*
5 changes: 5 additions & 0 deletions src/quantum/azext_quantum/operations/workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from ..vendored_sdks.azure_mgmt_quantum.models import QuantumWorkspaceIdentity
from ..vendored_sdks.azure_mgmt_quantum.models import Provider

DEFAULT_WORKSPACE_LOCATION = 'westus'

class WorkspaceInfo(object):
def __init__(self, cmd, resource_group_name=None, workspace_name=None, location=None):
Expand All @@ -35,6 +36,10 @@ def select_value(key, value):
self.name = select_value('workspace', workspace_name)
self.location = select_value('location', location)

# Finally, if a location is not specified, resort to the default.
if self.location is None or self.location == "":
self.location = DEFAULT_WORKSPACE_LOCATION

def clear(self):
self.subscription = ''
self.resource_group = ''
Expand Down
10 changes: 5 additions & 5 deletions src/quantum/azext_quantum/tests/latest/recordings/test_jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interactions:
- -g -w -l
User-Agent:
- python/3.8.2 (Windows-10-10.0.19041-SP0) msrest/0.6.19 msrest_azure/0.6.4
quantummanagementclient/2019-11-04-preview Azure-SDK-For-Python AZURECLI/2.15.1
quantummanagementclient/2019-11-04-preview Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
method: GET
Expand All @@ -30,7 +30,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 10 Dec 2020 00:41:54 GMT
- Fri, 18 Dec 2020 04:31:51 GMT
etag:
- '"57010011-0000-0700-0000-5fa604730000"'
expires:
Expand Down Expand Up @@ -75,14 +75,14 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 10 Dec 2020 00:41:54 GMT
- Fri, 18 Dec 2020 04:31:52 GMT
request-context:
- appId=cid-v1:4d6ac272-7369-45c6-9036-63d733c8519f
server:
- Microsoft-IIS/10.0
set-cookie:
- ARRAffinity=27001002d8b8551188d2c7cc4823ffdcadf45dae9b5914f9158d130543bcca9c;Path=/;HttpOnly;Secure;Domain=westus.quantum.azure.com
- ARRAffinitySameSite=27001002d8b8551188d2c7cc4823ffdcadf45dae9b5914f9158d130543bcca9c;Path=/;HttpOnly;SameSite=None;Secure;Domain=westus.quantum.azure.com
- ARRAffinity=65f634b3cbf2630e5599d9028e59ac832794a9c57ae50a1a9655757a4f209c6b;Path=/;HttpOnly;Secure;Domain=westus.quantum.azure.com
- ARRAffinitySameSite=65f634b3cbf2630e5599d9028e59ac832794a9c57ae50a1a9655757a4f209c6b;Path=/;HttpOnly;SameSite=None;Secure;Domain=westus.quantum.azure.com
strict-transport-security:
- max-age=2592000
transfer-encoding:
Expand Down
16 changes: 8 additions & 8 deletions src/quantum/azext_quantum/tests/latest/recordings/test_targets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interactions:
- -g -w -l
User-Agent:
- python/3.8.2 (Windows-10-10.0.19041-SP0) msrest/0.6.19 msrest_azure/0.6.4
quantummanagementclient/2019-11-04-preview Azure-SDK-For-Python AZURECLI/2.15.1
quantummanagementclient/2019-11-04-preview Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
method: GET
Expand All @@ -30,7 +30,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 10 Dec 2020 00:41:53 GMT
- Fri, 18 Dec 2020 04:31:50 GMT
etag:
- '"57010011-0000-0700-0000-5fa604730000"'
expires:
Expand Down Expand Up @@ -75,14 +75,14 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 10 Dec 2020 00:41:54 GMT
- Fri, 18 Dec 2020 04:31:51 GMT
request-context:
- appId=cid-v1:4d6ac272-7369-45c6-9036-63d733c8519f
server:
- Microsoft-IIS/10.0
set-cookie:
- ARRAffinity=27001002d8b8551188d2c7cc4823ffdcadf45dae9b5914f9158d130543bcca9c;Path=/;HttpOnly;Secure;Domain=westus.quantum.azure.com
- ARRAffinitySameSite=27001002d8b8551188d2c7cc4823ffdcadf45dae9b5914f9158d130543bcca9c;Path=/;HttpOnly;SameSite=None;Secure;Domain=westus.quantum.azure.com
- ARRAffinity=65f634b3cbf2630e5599d9028e59ac832794a9c57ae50a1a9655757a4f209c6b;Path=/;HttpOnly;Secure;Domain=westus.quantum.azure.com
- ARRAffinitySameSite=65f634b3cbf2630e5599d9028e59ac832794a9c57ae50a1a9655757a4f209c6b;Path=/;HttpOnly;SameSite=None;Secure;Domain=westus.quantum.azure.com
strict-transport-security:
- max-age=2592000
transfer-encoding:
Expand Down Expand Up @@ -119,14 +119,14 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 10 Dec 2020 00:41:54 GMT
- Fri, 18 Dec 2020 04:31:52 GMT
request-context:
- appId=cid-v1:4d6ac272-7369-45c6-9036-63d733c8519f
server:
- Microsoft-IIS/10.0
set-cookie:
- ARRAffinity=27001002d8b8551188d2c7cc4823ffdcadf45dae9b5914f9158d130543bcca9c;Path=/;HttpOnly;Secure;Domain=westus.quantum.azure.com
- ARRAffinitySameSite=27001002d8b8551188d2c7cc4823ffdcadf45dae9b5914f9158d130543bcca9c;Path=/;HttpOnly;SameSite=None;Secure;Domain=westus.quantum.azure.com
- ARRAffinity=65f634b3cbf2630e5599d9028e59ac832794a9c57ae50a1a9655757a4f209c6b;Path=/;HttpOnly;Secure;Domain=westus.quantum.azure.com
- ARRAffinitySameSite=65f634b3cbf2630e5599d9028e59ac832794a9c57ae50a1a9655757a4f209c6b;Path=/;HttpOnly;SameSite=None;Secure;Domain=westus.quantum.azure.com
strict-transport-security:
- max-age=2592000
transfer-encoding:
Expand Down
62 changes: 31 additions & 31 deletions src/quantum/azext_quantum/tests/latest/recordings/test_workspace.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/quantum/azext_quantum/tests/latest/test_quantum_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))


class QuantumScenarioTest(ScenarioTest):
class QuantumJobsScenarioTest(ScenarioTest):

def test_jobs(self):
# Since azure quantum is still in private preview, we require
Expand Down
2 changes: 1 addition & 1 deletion src/quantum/azext_quantum/tests/latest/test_quantum_targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))


class QuantumScenarioTest(ScenarioTest):
class QuantumTargetsScenarioTest(ScenarioTest):

def test_targets(self):
# Since azure quantum is still in private preview, we require
Expand Down
2 changes: 1 addition & 1 deletion src/quantum/azext_quantum/tests/latest/test_quantum_workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))


class QuantumScenarioTest(ScenarioTest):
class QuantumWorkspacesScenarioTest(ScenarioTest):

def test_workspace(self):
# Since azure quantum is still in private preview, we require
Expand Down
2 changes: 1 addition & 1 deletion src/quantum/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# TODO: Confirm this is the right version number you want and it matches your
# HISTORY.rst entry.
VERSION = '0.14.2012.701'
VERSION = '0.14.2012.1501'

# The full list of classifiers is available at
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down