diff --git a/continue-to-use-pydantic-1.patch b/continue-to-use-pydantic-1.patch new file mode 100644 index 0000000..ae08b94 --- /dev/null +++ b/continue-to-use-pydantic-1.patch @@ -0,0 +1,99 @@ +Index: qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/configuration.py +=================================================================== +--- qcs-api-client-python-0.23.1.orig/qcs_api_client/client/_configuration/configuration.py ++++ qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/configuration.py +@@ -2,7 +2,7 @@ import os + from pathlib import Path + from typing import Optional + +-from pydantic.main import BaseModel ++from pydantic.v1 import BaseModel + + from .error import QCSClientConfigurationError + from .secrets import ( +Index: qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/environment.py +=================================================================== +--- qcs-api-client-python-0.23.1.orig/qcs_api_client/client/_configuration/environment.py ++++ qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/environment.py +@@ -1,8 +1,8 @@ + import os + from typing import Any, Dict + +-from pydantic import BaseModel +-from pydantic.utils import deep_update ++from pydantic.v1 import BaseModel ++from pydantic.v1.utils import deep_update + + + class _EnvironmentBaseModel(BaseModel): +Index: qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/secrets.py +=================================================================== +--- qcs-api-client-python-0.23.1.orig/qcs_api_client/client/_configuration/secrets.py ++++ qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/secrets.py +@@ -4,8 +4,8 @@ from typing import Dict, Optional, Union + + import toml + from jwt import decode +-from pydantic import BaseModel, ValidationError +-from pydantic.fields import Field ++from pydantic.v1 import BaseModel, ValidationError ++from pydantic.v1.fields import Field + + from .file import QCSClientConfigurationFile + +Index: qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/settings.py +=================================================================== +--- qcs-api-client-python-0.23.1.orig/qcs_api_client/client/_configuration/settings.py ++++ qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/settings.py +@@ -1,7 +1,7 @@ + from typing import Dict, Optional +-from pydantic import BaseModel +-from pydantic.fields import Field +-from pydantic.networks import HttpUrl ++from pydantic.v1 import BaseModel ++from pydantic.v1.fields import Field ++from pydantic.v1.networks import HttpUrl + from enum import Enum + from .environment import EnvironmentModel + from .file import QCSClientConfigurationFile +Index: qcs-api-client-python-0.23.1/qcs_api_client/client/auth.py +=================================================================== +--- qcs-api-client-python-0.23.1.orig/qcs_api_client/client/auth.py ++++ qcs-api-client-python-0.23.1/qcs_api_client/client/auth.py +@@ -1,7 +1,7 @@ + import asyncio + import threading + import httpx +-from pydantic import BaseModel, Field ++from pydantic.v1 import BaseModel, Field + from http import HTTPStatus + from typing import Set + +Index: qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/file.py +=================================================================== +--- qcs-api-client-python-0.23.1.orig/qcs_api_client/client/_configuration/file.py ++++ qcs-api-client-python-0.23.1/qcs_api_client/client/_configuration/file.py +@@ -2,8 +2,8 @@ from pathlib import Path + from typing import Any, Dict, Optional + + import toml +-from pydantic.types import FilePath +-from pydantic.utils import deep_update ++from pydantic.v1.types import FilePath ++from pydantic.v1.utils import deep_update + + from .environment import _EnvironmentBaseModel + +Index: qcs-api-client-python-0.23.1/tests/test_client/test_client_configuration/test_client_configuration_file.py +=================================================================== +--- qcs-api-client-python-0.23.1.orig/tests/test_client/test_client_configuration/test_client_configuration_file.py ++++ qcs-api-client-python-0.23.1/tests/test_client/test_client_configuration/test_client_configuration_file.py +@@ -1,7 +1,7 @@ + from pathlib import Path + + import toml +-from pydantic.main import BaseConfig ++from pydantic.v1 import BaseConfig + + from qcs_api_client.client._configuration.file import QCSClientConfigurationFile + diff --git a/python-qcs-api-client.changes b/python-qcs-api-client.changes index b4f2729..121d655 100644 --- a/python-qcs-api-client.changes +++ b/python-qcs-api-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 18 03:11:38 UTC 2024 - Steve Kowalik + +- Add patch continue-to-use-pydantic-1.patch, use pydantic.v1 to fall + back to the old version of Pydantic. + ------------------------------------------------------------------- Fri Dec 8 16:13:04 UTC 2023 - Dirk Müller diff --git a/python-qcs-api-client.spec b/python-qcs-api-client.spec index b6af640..75e68da 100644 --- a/python-qcs-api-client.spec +++ b/python-qcs-api-client.spec @@ -1,7 +1,7 @@ # # spec file for package python-qcs-api-client # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ URL: https://github.com/rigetti/qcs-api-client-python Source: https://github.com/rigetti/qcs-api-client-python/archive/refs/tags/v%{version}.tar.gz#/qcs-api-client-%{version}.tar.gz # PATCH-FIX-OPENSUSE Use pyRFC3339 rather than rfc3339 which is not packaged Patch0: switch-to-pyrfc3339.patch +# PATCH-FIX-OPENSUSE Import from pydantic.v1 rather than pydantic +Patch1: continue-to-use-pydantic-1.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core} @@ -77,7 +79,7 @@ Allows access to the Rigetti Quantum Computing System API %files %{python_files} %license LICENSE %doc README.md -%{python_sitelib}/qcs_api_client-%{version}*.dist-info +%{python_sitelib}/qcs_api_client-%{version}.dist-info %{python_sitelib}/qcs_api_client %changelog