From 65d7a89e6027664a039327e9be49b306f216b5ce Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 27 Jul 2024 21:16:01 +0200 Subject: python311Packages.python-openstackclient: use sphinxHook --- .../python-modules/python-openstackclient/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'pkgs/development/python-modules/python-openstackclient') diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index fc48197864ab..e77afb78c81b 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, ddt, - installShellFiles, openstackdocstheme, osc-lib, pbr, @@ -11,7 +10,7 @@ python-keystoneclient, python-novaclient, requests-mock, - sphinx, + sphinxHook, sphinxcontrib-apidoc, stestr, }: @@ -27,12 +26,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - installShellFiles openstackdocstheme - sphinx + sphinxHook sphinxcontrib-apidoc ]; + sphinxBuilders = [ "man" ]; + propagatedBuildInputs = [ osc-lib pbr @@ -41,11 +41,6 @@ buildPythonPackage rec { python-novaclient ]; - postInstall = '' - sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man - installManPage doc/build/man/openstack.1 - ''; - nativeCheckInputs = [ ddt stestr -- cgit v1.2.3 From 47ee8653476c3a2c6d5275b7f89758f9eaac6b96 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 27 Jul 2024 21:00:23 +0200 Subject: python311Packages.python-openstackclient: use pyproject = true --- .../python-modules/python-openstackclient/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/development/python-modules/python-openstackclient') diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index e77afb78c81b..50aa590d6b6a 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -10,6 +10,7 @@ python-keystoneclient, python-novaclient, requests-mock, + setuptools, sphinxHook, sphinxcontrib-apidoc, stestr, @@ -18,22 +19,23 @@ buildPythonPackage rec { pname = "python-openstackclient"; version = "6.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw="; }; - nativeBuildInputs = [ + build-system = [ openstackdocstheme + setuptools sphinxHook sphinxcontrib-apidoc ]; sphinxBuilders = [ "man" ]; - propagatedBuildInputs = [ + dependencies = [ osc-lib pbr python-cinderclient @@ -48,7 +50,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "openstackclient" ]; -- cgit v1.2.3 From b5fc3a09e191b7401d52b4226fc8ebce8dd7051e Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 27 Jul 2024 19:40:07 +0200 Subject: openstackclient-full: init Goal of this package is to package OpenStack client with all available OpenStack CLI plugins in NixOS. See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst --- .../python-modules/python-openstackclient/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'pkgs/development/python-modules/python-openstackclient') diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 50aa590d6b6a..7460aab4dbbc 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -6,8 +6,13 @@ openstackdocstheme, osc-lib, pbr, + python-barbicanclient, python-cinderclient, + python-designateclient, + python-heatclient, + python-ironicclient, python-keystoneclient, + python-manilaclient, python-novaclient, requests-mock, setuptools, @@ -45,8 +50,8 @@ buildPythonPackage rec { nativeCheckInputs = [ ddt - stestr requests-mock + stestr ]; checkPhase = '' @@ -57,6 +62,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "openstackclient" ]; + passthru.optional-dependencies = { + # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst + cli-plugins = [ + python-barbicanclient + python-designateclient + python-heatclient + python-ironicclient + python-manilaclient + ]; + }; + meta = with lib; { description = "OpenStack Command-line Client"; mainProgram = "openstack"; -- cgit v1.2.3 From a1e38ef32c8f315f143bb7f80c8ecc13eb839b21 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 27 Jul 2024 19:47:49 +0200 Subject: openstackclient: add passthru.tests.version --- .../python-openstackclient/default.nix | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'pkgs/development/python-modules/python-openstackclient') diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 7460aab4dbbc..e3dd953e93b0 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -14,11 +14,13 @@ python-keystoneclient, python-manilaclient, python-novaclient, + python-openstackclient, requests-mock, setuptools, sphinxHook, sphinxcontrib-apidoc, stestr, + testers, }: buildPythonPackage rec { @@ -62,15 +64,21 @@ buildPythonPackage rec { pythonImportsCheck = [ "openstackclient" ]; - passthru.optional-dependencies = { - # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst - cli-plugins = [ - python-barbicanclient - python-designateclient - python-heatclient - python-ironicclient - python-manilaclient - ]; + passthru = { + optional-dependencies = { + # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst + cli-plugins = [ + python-barbicanclient + python-designateclient + python-heatclient + python-ironicclient + python-manilaclient + ]; + }; + tests.version = testers.testVersion { + package = python-openstackclient; + command = "openstack --version"; + }; }; meta = with lib; { -- cgit v1.2.3 From ac75d2ec78c77f5fcba0a18b5479803b9d66ab80 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 12 Aug 2024 21:16:23 +0200 Subject: python311Packages.python-openstackclient: 6.6.0 -> 7.0.0 https://github.com/openstack/python-openstackclient/compare/6.6.0...7.0.0 --- .../development/python-modules/python-openstackclient/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/python-modules/python-openstackclient') 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 = [ -- cgit v1.2.3 From 21d76a4ff3b0bbb111a4d4f90a407ddf969470be Mon Sep 17 00:00:00 2001 From: Valentin Chassignol Date: Mon, 29 Jul 2024 21:07:09 +0200 Subject: python312Packages.python-openstackclient Add neutron and octavia as CLI plugins --- pkgs/development/python-modules/python-openstackclient/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/python-modules/python-openstackclient') diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 114b2aae444b..f78874f9124b 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -13,6 +13,7 @@ python-ironicclient, python-keystoneclient, python-manilaclient, + python-neutronclient, python-openstackclient, requests-mock, requests, @@ -73,6 +74,7 @@ buildPythonPackage rec { python-heatclient python-ironicclient python-manilaclient + python-neutronclient ]; }; tests.version = testers.testVersion { -- cgit v1.2.3 From c03d445db91242c0c96da8b3699c54b707ae403f Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 20:09:12 +0200 Subject: python311Packages.python-mistralclient: init at 5.3.0 https://opendev.org/openstack/python-mistralclient --- pkgs/development/python-modules/python-openstackclient/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/python-modules/python-openstackclient') diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index f78874f9124b..3f3989283f74 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -13,6 +13,7 @@ python-ironicclient, python-keystoneclient, python-manilaclient, + python-mistralclient, python-neutronclient, python-openstackclient, requests-mock, @@ -74,6 +75,7 @@ buildPythonPackage rec { python-heatclient python-ironicclient python-manilaclient + python-mistralclient python-neutronclient ]; }; -- cgit v1.2.3