diff --git a/CHANGES.rst b/CHANGES.rst index 562ca6d..633c6cd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,16 @@ ChangeLog ========= +`1.15.0 (2023-05-12) `_ +-------------------------------------------------------------------------------------------- + +* Add nl-ams-3 AZ + +`1.14.0 (2022-11-02) `_ +-------------------------------------------------------------------------------------------- + +* Add pl-waw-2 AZ + `1.13.1 (2022-02-02) `_ -------------------------------------------------------------------------------------------- diff --git a/README.rst b/README.rst index e659cc9..0326245 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ Scaleway SDK Python SDK to query `Scaleway `_'s `APIs `_. -Stable release: |release| |versions| |license| |dependencies| +Stable release: |release| |versions| |license| Development: |build| |coverage| |quality| @@ -17,9 +17,6 @@ Development: |build| |coverage| |quality| .. |license| image:: https://img.shields.io/pypi/l/scaleway-sdk.svg :target: https://opensource.org/licenses/BSD-2-Clause :alt: Software license -.. |dependencies| image:: https://requires.io/github/scaleway/python-scaleway/requirements.svg?branch=master - :target: https://requires.io/github/scaleway/python-scaleway/requirements/?branch=master - :alt: Requirements freshness .. |build| image:: https://travis-ci.org/scaleway/python-scaleway.svg?branch=develop :target: https://travis-ci.org/scaleway/python-scaleway :alt: Unit-tests status diff --git a/scaleway/apis/__init__.py b/scaleway/apis/__init__.py index 0325c94..57f8a95 100644 --- a/scaleway/apis/__init__.py +++ b/scaleway/apis/__init__.py @@ -18,7 +18,7 @@ import requests import slumber -__version__ = '1.13.1' +__version__ = '1.15.0' # To enable logging, the client application needs to configure the logging std diff --git a/scaleway/apis/api_account.py b/scaleway/apis/api_account.py index 9dc0aef..9bc0b11 100644 --- a/scaleway/apis/api_account.py +++ b/scaleway/apis/api_account.py @@ -31,7 +31,7 @@ class BadToken(InvalidToken): class AccountAPI(API): """ Interacts with Scaleway Account API. """ - base_url = 'https://account.scaleway.com/' + base_url = 'https://api.scaleway.com/account/v1' def perm_matches(self, request_perm, effective_perm): """ Evaluates whether `request_perm` is granted by `effective_perm`. diff --git a/scaleway/apis/api_billing.py b/scaleway/apis/api_billing.py index 4dfe366..bcc3754 100644 --- a/scaleway/apis/api_billing.py +++ b/scaleway/apis/api_billing.py @@ -3,7 +3,7 @@ class BillingAPI(API): - base_url = 'https://billing.scaleway.com' + base_url = 'https://api.scaleway.com/billing/v1' def __init__(self, **kwargs): base_url = kwargs.pop('base_url', BillingAPI.base_url) diff --git a/scaleway/apis/api_compute.py b/scaleway/apis/api_compute.py index f93bf5f..8b1bbc5 100644 --- a/scaleway/apis/api_compute.py +++ b/scaleway/apis/api_compute.py @@ -12,28 +12,34 @@ REGIONS = { 'par1': { - 'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/', + 'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-1/', }, 'ams1': { - 'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/', + 'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/', }, 'fr-par-1': { - 'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/', + 'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-1/', }, 'fr-par-2': { - 'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-2/', + 'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-2/', }, 'fr-par-3': { - 'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-3/', + 'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-3/', }, 'nl-ams-1': { - 'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/', + 'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/', }, 'nl-ams-2': { - 'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-2/', + 'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-2/', + }, + 'nl-ams-3': { + 'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-3/', }, 'pl-waw-1': { - 'url': 'https://api-pl-waw.scaleway.com/instance/v1/zones/pl-waw-1/', + 'url': 'https://api.scaleway.com/instance/v1/zones/pl-waw-1/', + }, + 'pl-waw-2': { + 'url': 'https://api.scaleway.com/instance/v1/zones/pl-waw-2/', } } diff --git a/scaleway/tests/apis/test_api_billing.py b/scaleway/tests/apis/test_api_billing.py index 92adbb9..aca0df3 100644 --- a/scaleway/tests/apis/test_api_billing.py +++ b/scaleway/tests/apis/test_api_billing.py @@ -6,4 +6,4 @@ class TestBillingAPI(unittest.TestCase): def test_valid_endpoint(self): - self.assertEqual(BillingAPI().base_url, 'https://billing.scaleway.com') + self.assertEqual(BillingAPI().base_url, 'https://api.scaleway.com/billing/v1') diff --git a/scaleway/tests/apis/test_api_compute.py b/scaleway/tests/apis/test_api_compute.py index 0996c48..1e74cbd 100644 --- a/scaleway/tests/apis/test_api_compute.py +++ b/scaleway/tests/apis/test_api_compute.py @@ -9,18 +9,18 @@ def test_set_region(self): # Default region: par1. self.assertEqual( ComputeAPI().base_url, - 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/' + 'https://api.scaleway.com/instance/v1/zones/fr-par-1/' ) # Explicit "region". self.assertEqual( ComputeAPI(region='par1').base_url, - 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/' + 'https://api.scaleway.com/instance/v1/zones/fr-par-1/' ) self.assertEqual( ComputeAPI(region='ams1').base_url, - 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/' + 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/' ) # Explicit "base_url" diff --git a/setup.cfg b/setup.cfg index 6b95e3d..8fb6dad 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ universal = 1 # https://github.com/peritus/bumpversion#configuration [bumpversion] -current_version = 1.13.1 +current_version = 1.15.0 files = ./scaleway/__init__.py ./CHANGES.rst allow_dirty = True commit = False