From f2002e51a20240750143306882042df69cb77def Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 12 Aug 2024 21:02:25 +0200 Subject: [PATCH 1/5] python311Packages.keystoneauth1: 5.6.0 -> 5.7.0 https://github.com/openstack/keystoneauth/compare/5.6.0...5.7.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index f6caa2d8e9e9..045da70affff 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.6.0"; + version = "5.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7LfzR1nr4QPbNyqwlTwLghkp3dSX8zKqaz72yqz/7Yg="; + hash = "sha256-sswtaNGkjpwsbZsbH9ANfHvf4IboBAtR5wk4qLo639E="; }; postPatch = '' @@ -40,9 +40,9 @@ buildPythonPackage rec { rm test-requirements.txt ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ betamax iso8601 lxml From 0ecfa2b92131ed9c6d45bfef32f0cb129582d708 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 12 Aug 2024 21:03:57 +0200 Subject: [PATCH 2/5] python311Packages.oslo-config: 9.4.0 -> 9.5.0 https://github.com/openstack/oslo.config/compare/9.4.0...9.5.0 --- .../python-modules/oslo-config/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 172c7a56b9a7..c799b6c67f30 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -9,19 +9,20 @@ pyyaml, requests, rfc3986, + setuptools, stevedore, callPackage, }: buildPythonPackage rec { pname = "oslo-config"; - version = "9.4.0"; - format = "setuptools"; + version = "9.5.0"; + pyproject = true; src = fetchPypi { pname = "oslo.config"; inherit version; - hash = "sha256-NbEaZhtgjttQMF2tkeTjCBnZDveUt9fbpb2LLvLrjA0="; + hash = "sha256-qlAARIhrbFX3ZXfLWpNJKkWWxfkoM3Z2DqeFLMScmaM="; }; postPatch = '' @@ -30,7 +31,9 @@ buildPythonPackage rec { rm test-requirements.txt ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ debtcollector netaddr oslo-i18n From 3367e5dca2495c48dff373f9ab241a85a1b9f07f Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 12 Aug 2024 21:15:46 +0200 Subject: [PATCH 3/5] python311Packages.oslo-log: 6.0.0 -> 6.1.1 https://github.com/openstack/oslo.log/compare/6.0.0...6.1.1 --- pkgs/development/python-modules/oslo-log/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 736267272ef1..7f0944134f18 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -14,22 +14,25 @@ python-dateutil, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "oslo-log"; - version = "6.0.0"; - format = "setuptools"; + version = "6.1.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-ifDW+iy6goH4m1CKf+Sb+5far1XFJ4GH1FowaZceaH8="; + hash = "sha256-41oSz+TK0T/7Cu2pn8yiCnBdD2lKhMLvewe0WWD4j7Q="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ oslo-config oslo-context oslo-serialization From ac75d2ec78c77f5fcba0a18b5479803b9d66ab80 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 12 Aug 2024 21:16:23 +0200 Subject: [PATCH 4/5] python311Packages.python-openstackclient: 6.6.0 -> 7.0.0 https://github.com/openstack/python-openstackclient/compare/6.6.0...7.0.0 --- .../python-modules/python-openstackclient/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index e3dd953e93b0..114b2aae444b 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -13,9 +13,9 @@ python-ironicclient, python-keystoneclient, python-manilaclient, - python-novaclient, python-openstackclient, requests-mock, + requests, setuptools, sphinxHook, sphinxcontrib-apidoc, @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.6.0"; + version = "7.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw="; + hash = "sha256-1HDjWYySnZI/12j9+Gb1G9NKkb+xfrcMoTY/q7aL0uA="; }; build-system = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { pbr python-cinderclient python-keystoneclient - python-novaclient + requests ]; nativeCheckInputs = [ From 913a7502c0769be033c8d758c795a5a9fbc9d18f Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 12 Aug 2024 21:17:14 +0200 Subject: [PATCH 5/5] python311Packages.osc-lib: 2.8.0 -> 3.1.0 https://github.com/openstack/osc-lib/compare/2.8.0...3.1.0 --- .../python-modules/osc-lib/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 7e03de25fabf..db1ecc6d51d2 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -7,34 +7,41 @@ oslo-utils, openstacksdk, pbr, + pythonOlder, requests-mock, - simplejson, + setuptools, + requests, stestr, }: buildPythonPackage rec { pname = "osc-lib"; - version = "2.8.0"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "openstack"; repo = "osc-lib"; rev = version; - hash = "sha256-ijL/m9BTAgDUjqy77nkl3rDppeUPBycmEqlL6uMruIA="; + hash = "sha256-DDjWM4hjHPXYDeAJ6FDZZPzi65DG1rJ3efs8MouX1WY="; }; # fake version to make pbr.packaging happy and not reject it... PBR_VERSION = version; - nativeBuildInputs = [ pbr ]; + build-system = [ + pbr + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ cliff openstacksdk oslo-i18n oslo-utils - simplejson + requests ]; nativeCheckInputs = [