diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index a3f49b0f63a3..b22d3b4ed7df 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, ddt, + hacking, installShellFiles, openstackdocstheme, osc-lib, @@ -35,14 +36,14 @@ buildPythonPackage (finalAttrs: { pname = "python-openstackclient"; - version = "9.0.0"; + version = "10.0.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-openstackclient"; tag = finalAttrs.version; - hash = "sha256-iqHm3vOENStdGI53Ggln/gWVnF3Lyomel9OFmwz2CJc="; + hash = "sha256-UczEgOtZz4roIFg1R6RDGg0tiiiT6lAgJCdgpmK0960="; }; patches = [ @@ -76,12 +77,14 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ ddt + hacking requests-mock stestrCheckHook ]; disabledTestsRegex = [ "openstackclient.tests.unit.common.test_module.TestModuleList*" + "openstackclient.tests.unit.common.test_clientmanager.TestClientManager*" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch index 4ce54df89254..f04adec52144 100644 --- a/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch +++ b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch @@ -1,18 +1,13 @@ diff --git a/pyproject.toml b/pyproject.toml -index 37fb8d0c..21571714 100644 +index 50d90b4c..b256bb2a 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -730,10 +730,9 @@ volume_transfer_request_show = "openstackclient.volume.v3.volume_transfer_reques - volume_summary = "openstackclient.volume.v3.volume:VolumeSummary" +@@ -776,7 +776,7 @@ volume_summary = "openstackclient.volume.v3.volume:VolumeSummary" volume_revert = "openstackclient.volume.v3.volume:VolumeRevertToSnapshot" --[tool.setuptools] --packages = [ -- "openstackclient" --] -+[tool.setuptools.packages.find] -+where = ["."] -+include = ["openstackclient*"] + [tool.setuptools.packages.find] +-include = ["openstackclient"] ++include = ["openstackclient", "openstackclient.*"] [tool.mypy] - python_version = "3.10" + python_version = "3.11" \ No newline at end of file