From 759c32aca52a30ed4e79446f7bddfeced85dc83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Male=CC=81s?= Date: Thu, 4 Jul 2024 12:52:20 +0100 Subject: [PATCH] CP-1897 Fix versioning issue. --- .bumpversion.cfg | 2 +- .version | 1 + .../pyproject.toml | 2 +- thousandeyes-sdk-agents/pyproject.toml | 2 +- thousandeyes-sdk-alerts/pyproject.toml | 2 +- thousandeyes-sdk-bgp-monitors/pyproject.toml | 2 +- thousandeyes-sdk-core/pyproject.toml | 2 +- .../src/thousandeyes_sdk/core/__init__.py | 25 ------------------- .../src/thousandeyes_sdk/core/version.py | 22 ---------------- thousandeyes-sdk-credentials/pyproject.toml | 2 +- thousandeyes-sdk-dashboards/pyproject.toml | 2 +- .../pyproject.toml | 2 +- .../pyproject.toml | 2 +- .../pyproject.toml | 2 +- .../pyproject.toml | 2 +- .../pyproject.toml | 2 +- thousandeyes-sdk-instant-tests/pyproject.toml | 2 +- .../pyproject.toml | 2 +- thousandeyes-sdk-labels/pyproject.toml | 2 +- thousandeyes-sdk-snapshots/pyproject.toml | 2 +- thousandeyes-sdk-streaming/pyproject.toml | 2 +- thousandeyes-sdk-tags/pyproject.toml | 2 +- thousandeyes-sdk-test-results/pyproject.toml | 2 +- thousandeyes-sdk-tests/pyproject.toml | 2 +- thousandeyes-sdk-usage/pyproject.toml | 2 +- 25 files changed, 23 insertions(+), 69 deletions(-) create mode 100644 .version delete mode 100644 thousandeyes-sdk-core/src/thousandeyes_sdk/core/__init__.py delete mode 100644 thousandeyes-sdk-core/src/thousandeyes_sdk/core/version.py diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 339bc973..437dadb3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -3,4 +3,4 @@ current_version = 1.0.0 commit = False tag = False -[bumpversion:file:thousandeyes-sdk-core/src/thousandeyes_sdk/core/__init__.py] +[bumpversion:file:.version] diff --git a/.version b/.version new file mode 100644 index 00000000..3eefcb9d --- /dev/null +++ b/.version @@ -0,0 +1 @@ +1.0.0 diff --git a/thousandeyes-sdk-administrative/pyproject.toml b/thousandeyes-sdk-administrative/pyproject.toml index 02bab173..877c5c12 100644 --- a/thousandeyes-sdk-administrative/pyproject.toml +++ b/thousandeyes-sdk-administrative/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-agents/pyproject.toml b/thousandeyes-sdk-agents/pyproject.toml index 9d93d8e2..1e927a85 100644 --- a/thousandeyes-sdk-agents/pyproject.toml +++ b/thousandeyes-sdk-agents/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-alerts/pyproject.toml b/thousandeyes-sdk-alerts/pyproject.toml index 7f5d82a7..9c4c41a6 100644 --- a/thousandeyes-sdk-alerts/pyproject.toml +++ b/thousandeyes-sdk-alerts/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-bgp-monitors/pyproject.toml b/thousandeyes-sdk-bgp-monitors/pyproject.toml index f9df4919..8813ab92 100644 --- a/thousandeyes-sdk-bgp-monitors/pyproject.toml +++ b/thousandeyes-sdk-bgp-monitors/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-core/pyproject.toml b/thousandeyes-sdk-core/pyproject.toml index 9d276ee9..0dbec9ed 100644 --- a/thousandeyes-sdk-core/pyproject.toml +++ b/thousandeyes-sdk-core/pyproject.toml @@ -18,7 +18,7 @@ where = ["src/"] include = ["thousandeyes_sdk.core"] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-core/src/thousandeyes_sdk/core/__init__.py b/thousandeyes-sdk-core/src/thousandeyes_sdk/core/__init__.py deleted file mode 100644 index 0f9854f3..00000000 --- a/thousandeyes-sdk-core/src/thousandeyes_sdk/core/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2024 Cisco Systems, Inc. and its affiliates -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 - -from . import exceptions -from .api_client import ApiClient -from .api_response import ApiResponse -from .configuration import Configuration -from .version import Version - -import os.path - -__version__ = "1.0.0" diff --git a/thousandeyes-sdk-core/src/thousandeyes_sdk/core/version.py b/thousandeyes-sdk-core/src/thousandeyes_sdk/core/version.py deleted file mode 100644 index c7e4c097..00000000 --- a/thousandeyes-sdk-core/src/thousandeyes_sdk/core/version.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2024 Cisco Systems, Inc. and its affiliates -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 - -import thousandeyes_sdk.core - -class Version: - @staticmethod - def get() -> str: - return thousandeyes_sdk.core.__version__ diff --git a/thousandeyes-sdk-credentials/pyproject.toml b/thousandeyes-sdk-credentials/pyproject.toml index 31c87528..27296bd1 100644 --- a/thousandeyes-sdk-credentials/pyproject.toml +++ b/thousandeyes-sdk-credentials/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-dashboards/pyproject.toml b/thousandeyes-sdk-dashboards/pyproject.toml index baffe28f..0f0f3b95 100644 --- a/thousandeyes-sdk-dashboards/pyproject.toml +++ b/thousandeyes-sdk-dashboards/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-endpoint-agents/pyproject.toml b/thousandeyes-sdk-endpoint-agents/pyproject.toml index 98bedc75..56de2826 100644 --- a/thousandeyes-sdk-endpoint-agents/pyproject.toml +++ b/thousandeyes-sdk-endpoint-agents/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-endpoint-instant-tests/pyproject.toml b/thousandeyes-sdk-endpoint-instant-tests/pyproject.toml index 5de1e33a..dc0e034b 100644 --- a/thousandeyes-sdk-endpoint-instant-tests/pyproject.toml +++ b/thousandeyes-sdk-endpoint-instant-tests/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-endpoint-labels/pyproject.toml b/thousandeyes-sdk-endpoint-labels/pyproject.toml index a5d3d6cc..5c8502f3 100644 --- a/thousandeyes-sdk-endpoint-labels/pyproject.toml +++ b/thousandeyes-sdk-endpoint-labels/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-endpoint-test-results/pyproject.toml b/thousandeyes-sdk-endpoint-test-results/pyproject.toml index 171aa998..96fc0f32 100644 --- a/thousandeyes-sdk-endpoint-test-results/pyproject.toml +++ b/thousandeyes-sdk-endpoint-test-results/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-endpoint-tests/pyproject.toml b/thousandeyes-sdk-endpoint-tests/pyproject.toml index 28cf8944..79b0880a 100644 --- a/thousandeyes-sdk-endpoint-tests/pyproject.toml +++ b/thousandeyes-sdk-endpoint-tests/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-instant-tests/pyproject.toml b/thousandeyes-sdk-instant-tests/pyproject.toml index e5a85a9d..2fc2c132 100644 --- a/thousandeyes-sdk-instant-tests/pyproject.toml +++ b/thousandeyes-sdk-instant-tests/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-internet-insights/pyproject.toml b/thousandeyes-sdk-internet-insights/pyproject.toml index b3099aa5..48b6d113 100644 --- a/thousandeyes-sdk-internet-insights/pyproject.toml +++ b/thousandeyes-sdk-internet-insights/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-labels/pyproject.toml b/thousandeyes-sdk-labels/pyproject.toml index a5831ed9..25755949 100644 --- a/thousandeyes-sdk-labels/pyproject.toml +++ b/thousandeyes-sdk-labels/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-snapshots/pyproject.toml b/thousandeyes-sdk-snapshots/pyproject.toml index fe550819..a5d946c1 100644 --- a/thousandeyes-sdk-snapshots/pyproject.toml +++ b/thousandeyes-sdk-snapshots/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-streaming/pyproject.toml b/thousandeyes-sdk-streaming/pyproject.toml index fd84c7a2..08e23423 100644 --- a/thousandeyes-sdk-streaming/pyproject.toml +++ b/thousandeyes-sdk-streaming/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-tags/pyproject.toml b/thousandeyes-sdk-tags/pyproject.toml index 497b8e78..c6bf284c 100644 --- a/thousandeyes-sdk-tags/pyproject.toml +++ b/thousandeyes-sdk-tags/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-test-results/pyproject.toml b/thousandeyes-sdk-test-results/pyproject.toml index d8257ae3..b9127d6c 100644 --- a/thousandeyes-sdk-test-results/pyproject.toml +++ b/thousandeyes-sdk-test-results/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-tests/pyproject.toml b/thousandeyes-sdk-tests/pyproject.toml index 5000626d..3064aa20 100644 --- a/thousandeyes-sdk-tests/pyproject.toml +++ b/thousandeyes-sdk-tests/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [ diff --git a/thousandeyes-sdk-usage/pyproject.toml b/thousandeyes-sdk-usage/pyproject.toml index d4ae4088..1c32a8d7 100644 --- a/thousandeyes-sdk-usage/pyproject.toml +++ b/thousandeyes-sdk-usage/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [tool.setuptools.dynamic] -version = {attr = "thousandeyes_sdk.core.__version__"} +version = {file = ".version"} [project.optional-dependencies] test = [