From c4ff89b0002b9da9e7d97aeaa2774590f6922f41 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 1 Aug 2024 23:21:20 +0200 Subject: [PATCH 1/3] python311Packages.python-zaqarclient: init at 2.7.0 https://opendev.org/openstack/python-zaqarclient https://docs.openstack.org/python-zaqarclient/latest/ --- .../python-openstackclient/default.nix | 2 + .../python-zaqarclient/default.nix | 82 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/python-zaqarclient/default.nix diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 3a1a3a56ae95..d54b7d906d2f 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -17,6 +17,7 @@ python-mistralclient, python-neutronclient, python-openstackclient, + python-zaqarclient, requests-mock, requests, setuptools, @@ -79,6 +80,7 @@ buildPythonPackage rec { python-manilaclient python-mistralclient python-neutronclient + python-zaqarclient ]; }; tests.version = testers.testVersion { diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix new file mode 100644 index 000000000000..ee8c99b6b642 --- /dev/null +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + ddt, + fetchFromGitHub, + jsonschema, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-log, + oslo-utils, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxHook, + stestr, + stevedore, +}: + +buildPythonPackage rec { + pname = "python-zaqarclient"; + version = "2.7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-zaqarclient"; + rev = "refs/tags/${version}"; + hash = "sha256-WphTlqhrwxg5g88NH1W4b3uLAxLImnS34hDrlJjWeEU="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + jsonschema + keystoneauth1 + osc-lib + oslo-i18n + oslo-log + oslo-utils + requests + stevedore + ]; + + nativeCheckInputs = [ + ddt + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "zaqarclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-zaqarclient"; + description = "Client library for OpenStack Zaqar API"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb1c6cdddf59..07bbb8a3f241 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12856,6 +12856,8 @@ self: super: with self; { python-xz = callPackage ../development/python-modules/python-xz { }; + python-zaqarclient = callPackage ../development/python-modules/python-zaqarclient { }; + python-zbar = callPackage ../development/python-modules/python-zbar { }; pythran = callPackage ../development/python-modules/pythran { From 3ac0b617b418d580706df53249454d5348feab6e Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 4 Aug 2024 17:06:09 +0200 Subject: [PATCH 2/3] python311Packages.python-zunclient: init at 5.0.0 https://opendev.org/openstack/python-zunclient https://docs.openstack.org/python-zunclient/latest/ --- .../python-openstackclient/default.nix | 2 + .../python-zunclient/default.nix | 92 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 2 + 4 files changed, 97 insertions(+) create mode 100644 pkgs/development/python-modules/python-zunclient/default.nix diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index d54b7d906d2f..ffa0017a6e2f 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -18,6 +18,7 @@ python-neutronclient, python-openstackclient, python-zaqarclient, + python-zunclient, requests-mock, requests, setuptools, @@ -81,6 +82,7 @@ buildPythonPackage rec { python-mistralclient python-neutronclient python-zaqarclient + python-zunclient ]; }; tests.version = testers.testVersion { diff --git a/pkgs/development/python-modules/python-zunclient/default.nix b/pkgs/development/python-modules/python-zunclient/default.nix new file mode 100644 index 000000000000..f538cdbac638 --- /dev/null +++ b/pkgs/development/python-modules/python-zunclient/default.nix @@ -0,0 +1,92 @@ +{ + lib, + buildPythonPackage, + docker, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-log, + oslo-utils, + pbr, + prettytable, + pythonOlder, + setuptools, + sphinxHook, + stestr, + websocket-client, +}: + +buildPythonPackage rec { + pname = "python-zunclient"; + version = "5.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-zunclient"; + rev = "refs/tags/${version}"; + hash = "sha256-EVfrxSc/eHYZR0FGFnNAxFCiXangt8uRkAC2zpwWqcA="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + # python-openstackclient is unused upstream + # and will cause infinite recursion in openstackclient-full package. + pythonRemoveDeps = [ "python-openstackclient" ]; + + dependencies = [ + docker + keystoneauth1 + osc-lib + oslo-i18n + oslo-log + oslo-utils + prettytable + websocket-client + ]; + + nativeCheckInputs = [ stestr ]; + + checkPhase = '' + runHook preCheck + stestr run -e <(echo " + zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_internal + zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_public + zunclient.tests.unit.test_shell.ShellTest.test_main_env_region + zunclient.tests.unit.test_shell.ShellTest.test_main_no_region + zunclient.tests.unit.test_shell.ShellTest.test_main_option_region + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_internal + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_public + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_env_region + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_no_region + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_option_region + ") + runHook postCheck + ''; + + pythonImportsCheck = [ "zunclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-zunclient"; + description = "Client library for OpenStack Zun API"; + license = lib.licenses.asl20; + mainProgram = "zun"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5f76ffe5856..90e1360cdd14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22915,6 +22915,7 @@ with pkgs; mistralclient = with python311Packages; toPythonApplication python-mistralclient; swiftclient = with python311Packages; toPythonApplication python-swiftclient; troveclient = with python311Packages; toPythonApplication python-troveclient; + zunclient = with python311Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07bbb8a3f241..acac2234ca16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12860,6 +12860,8 @@ self: super: with self; { python-zbar = callPackage ../development/python-modules/python-zbar { }; + python-zunclient = callPackage ../development/python-modules/python-zunclient { }; + pythran = callPackage ../development/python-modules/pythran { inherit (pkgs.llvmPackages) openmp; }; From d9ebc910b23a158b59f5ca30586ed6d9ee6b7bc7 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 4 Aug 2024 17:21:22 +0200 Subject: [PATCH 3/3] python311Packages.python-watcherclient: init at 4.4.0 https://opendev.org/openstack/python-watcherclient https://wiki.openstack.org/wiki/Watcher --- .../python-openstackclient/default.nix | 2 + .../python-watcherclient/default.nix | 75 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 2 + 4 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/python-watcherclient/default.nix diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index ffa0017a6e2f..890fc02a1a88 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -17,6 +17,7 @@ python-mistralclient, python-neutronclient, python-openstackclient, + python-watcherclient, python-zaqarclient, python-zunclient, requests-mock, @@ -81,6 +82,7 @@ buildPythonPackage rec { python-manilaclient python-mistralclient python-neutronclient + python-watcherclient python-zaqarclient python-zunclient ]; diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix new file mode 100644 index 000000000000..b3cc4267f30c --- /dev/null +++ b/pkgs/development/python-modules/python-watcherclient/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-serialization, + oslo-utils, + pbr, + pythonOlder, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-watcherclient"; + version = "4.4.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-watcherclient"; + rev = "refs/tags/${version}"; + hash = "sha256-lDdiZKaeteKZEyfjpBx8KY+0FLFOYAnQXl0pTbqq0Ss="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxcontrib-apidoc + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + cliff + keystoneauth1 + osc-lib + oslo-i18n + oslo-serialization + oslo-utils + ]; + + nativeCheckInputs = [ stestr ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "watcherclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-watcherclient"; + description = "Client library for OpenStack Watcher API"; + license = lib.licenses.asl20; + mainProgram = "watcher"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90e1360cdd14..d6e64c83076e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22915,6 +22915,7 @@ with pkgs; mistralclient = with python311Packages; toPythonApplication python-mistralclient; swiftclient = with python311Packages; toPythonApplication python-swiftclient; troveclient = with python311Packages; toPythonApplication python-troveclient; + watcherclient = with python311Packages; toPythonApplication python-watcherclient; zunclient = with python311Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acac2234ca16..42929bc9020f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12846,6 +12846,8 @@ self: super: with self; { python-vlc = callPackage ../development/python-modules/python-vlc { }; + python-watcherclient = callPackage ../development/python-modules/python-watcherclient { }; + python-whois = callPackage ../development/python-modules/python-whois { }; python-wifi = callPackage ../development/python-modules/python-wifi { };