Merge pull request #330486 from anthonyroussel/openstack-sphinx-docs

authored by Sandro and committed by GitHub 7c7ddf3b 88b20849

+121 -45
+9 -12
pkgs/development/python-modules/cliff/default.nix
··· 5 5 autopage, 6 6 cmd2, 7 7 importlib-metadata, 8 - installShellFiles, 9 8 openstackdocstheme, 10 9 pbr, 11 10 prettytable, 12 11 pyparsing, 13 12 pyyaml, 13 + setuptools, 14 14 stevedore, 15 - sphinx, 15 + sphinxHook, 16 16 callPackage, 17 17 }: 18 18 19 19 buildPythonPackage rec { 20 20 pname = "cliff"; 21 21 version = "4.7.0"; 22 - format = "setuptools"; 22 + pyproject = true; 23 23 24 24 src = fetchPypi { 25 25 inherit pname version; ··· 32 32 rm test-requirements.txt 33 33 ''; 34 34 35 - nativeBuildInputs = [ 36 - installShellFiles 35 + build-system = [ 37 36 openstackdocstheme 38 - sphinx 37 + setuptools 38 + sphinxHook 39 39 ]; 40 40 41 - propagatedBuildInputs = [ 41 + sphinxBuilders = [ "man" ]; 42 + 43 + dependencies = [ 42 44 autopage 43 45 cmd2 44 46 importlib-metadata ··· 48 50 pyyaml 49 51 stevedore 50 52 ]; 51 - 52 - postInstall = '' 53 - sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man 54 - installManPage doc/build/man/cliff.1 55 - ''; 56 53 57 54 # check in passthru.tests.pytest to escape infinite recursion with stestr 58 55 doCheck = false;
+13 -3
pkgs/development/python-modules/debtcollector/default.nix
··· 2 2 lib, 3 3 buildPythonPackage, 4 4 fetchPypi, 5 + openstackdocstheme, 5 6 pbr, 6 7 six, 8 + setuptools, 9 + sphinxHook, 7 10 wrapt, 8 11 callPackage, 9 12 }: ··· 11 14 buildPythonPackage rec { 12 15 pname = "debtcollector"; 13 16 version = "3.0.0"; 14 - format = "setuptools"; 17 + pyproject = true; 15 18 16 19 src = fetchPypi { 17 20 inherit pname version; 18 21 hash = "sha256-KokX0lsOHx0NNl08HG7Px6UiselxbooaSpFRJvfM6m8="; 19 22 }; 20 23 21 - nativeBuildInputs = [ pbr ]; 24 + build-system = [ 25 + openstackdocstheme 26 + pbr 27 + setuptools 28 + sphinxHook 29 + ]; 22 30 23 - propagatedBuildInputs = [ 31 + sphinxBuilders = [ "man" ]; 32 + 33 + dependencies = [ 24 34 six 25 35 wrapt 26 36 ];
+20 -1
pkgs/development/python-modules/openstacksdk/default.nix
··· 11 11 keystoneauth1, 12 12 munch, 13 13 netifaces, 14 + openstackdocstheme, 14 15 os-service-types, 15 16 pbr, 16 17 pythonOlder, 17 18 pyyaml, 18 19 requestsexceptions, 19 20 setuptools, 21 + sphinxHook, 20 22 }: 21 23 22 24 buildPythonPackage rec { ··· 26 28 27 29 disabled = pythonOlder "3.7"; 28 30 31 + outputs = [ 32 + "out" 33 + "man" 34 + ]; 35 + 29 36 src = fetchPypi { 30 37 inherit pname version; 31 38 hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA="; 32 39 }; 33 40 34 - build-system = [ setuptools ]; 41 + postPatch = '' 42 + # Disable rsvgconverter not needed to build manpage 43 + substituteInPlace doc/source/conf.py \ 44 + --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter'," 45 + ''; 46 + 47 + build-system = [ 48 + openstackdocstheme 49 + setuptools 50 + sphinxHook 51 + ]; 52 + 53 + sphinxBuilders = [ "man" ]; 35 54 36 55 dependencies = [ 37 56 platformdirs
+15
pkgs/development/python-modules/python-barbicanclient/default.nix
··· 4 4 cliff, 5 5 fetchFromGitea, 6 6 keystoneauth1, 7 + openstackdocstheme, 7 8 oslo-i18n, 8 9 oslo-serialization, 9 10 oslo-utils, ··· 12 13 requests-mock, 13 14 requests, 14 15 setuptools, 16 + sphinxcontrib-apidoc, 17 + sphinxHook, 15 18 stestr, 16 19 }: 17 20 ··· 32 35 33 36 env.PBR_VERSION = version; 34 37 38 + postPatch = '' 39 + # Disable rsvgconverter not needed to build manpage 40 + substituteInPlace doc/source/conf.py \ 41 + --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter'," 42 + ''; 43 + 35 44 build-system = [ 45 + openstackdocstheme 36 46 pbr 37 47 setuptools 48 + sphinxHook 49 + sphinxcontrib-apidoc 38 50 ]; 51 + 52 + sphinxBuilders = [ "man" ]; 39 53 40 54 dependencies = [ 41 55 cliff ··· 65 79 homepage = "https://opendev.org/openstack/python-barbicanclient"; 66 80 description = "Client library for OpenStack Barbican API"; 67 81 license = lib.licenses.asl20; 82 + mainProgram = "barbican"; 68 83 maintainers = lib.teams.openstack.members; 69 84 }; 70 85 }
+8
pkgs/development/python-modules/python-designateclient/default.nix
··· 5 5 fetchFromGitea, 6 6 jsonschema, 7 7 keystoneauth1, 8 + openstackdocstheme, 8 9 osc-lib, 9 10 oslo-serialization, 10 11 oslo-utils, ··· 14 15 requests-mock, 15 16 requests, 16 17 setuptools, 18 + sphinxHook, 19 + sphinxcontrib-apidoc, 17 20 stestr, 18 21 }: 19 22 ··· 35 38 env.PBR_VERSION = version; 36 39 37 40 build-system = [ 41 + openstackdocstheme 38 42 pbr 39 43 setuptools 44 + sphinxHook 45 + sphinxcontrib-apidoc 40 46 ]; 47 + 48 + sphinxBuilders = [ "man" ]; 41 49 42 50 dependencies = [ 43 51 debtcollector
+17 -2
pkgs/development/python-modules/python-heatclient/default.nix
··· 5 5 fetchPypi, 6 6 iso8601, 7 7 keystoneauth1, 8 + openstackdocstheme, 8 9 osc-lib, 9 10 oslo-i18n, 10 11 oslo-serialization, ··· 16 17 pyyaml, 17 18 requests, 18 19 requests-mock, 20 + setuptools, 21 + sphinxHook, 19 22 stestr, 20 23 testscenarios, 21 24 }: ··· 23 26 buildPythonPackage rec { 24 27 pname = "python-heatclient"; 25 28 version = "3.5.0"; 26 - format = "setuptools"; 29 + pyproject = true; 27 30 28 31 disabled = pythonOlder "3.8"; 29 32 ··· 32 35 hash = "sha256-B1F40HYHFF91mkxwySR/kqCvlwLLtBgqwUvw2byOc9g="; 33 36 }; 34 37 35 - propagatedBuildInputs = [ 38 + build-system = [ 39 + openstackdocstheme 40 + setuptools 41 + sphinxHook 42 + ]; 43 + 44 + sphinxBuilders = [ "man" ]; 45 + 46 + dependencies = [ 36 47 cliff 37 48 iso8601 38 49 keystoneauth1 ··· 54 65 ]; 55 66 56 67 checkPhase = '' 68 + runHook preCheck 69 + 57 70 stestr run -e <(echo " 58 71 heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file 59 72 heatclient.tests.unit.test_deployment_utils.TempURLSignalTest.test_create_temp_url 60 73 ") 74 + 75 + runHook postCheck 61 76 ''; 62 77 63 78 pythonImportsCheck = [ "heatclient" ];
+17 -2
pkgs/development/python-modules/python-ironicclient/default.nix
··· 6 6 dogpile-cache, 7 7 jsonschema, 8 8 keystoneauth1, 9 + openstackdocstheme, 9 10 openstacksdk, 10 11 osc-lib, 11 12 oslo-utils, ··· 15 16 pyyaml, 16 17 requests, 17 18 requests-mock, 19 + setuptools, 20 + sphinxcontrib-apidoc, 21 + sphinxHook, 18 22 stestr, 19 23 stevedore, 20 24 }: ··· 22 26 buildPythonPackage rec { 23 27 pname = "python-ironicclient"; 24 28 version = "5.7.0"; 25 - format = "setuptools"; 29 + pyproject = true; 26 30 27 31 src = fetchPypi { 28 32 inherit pname version; 29 33 hash = "sha256-Blx0pr73uZA8eHd2iZ9WY+aozBFWsQhWpxoQKtjtJSk="; 30 34 }; 31 35 32 - propagatedBuildInputs = [ 36 + build-system = [ 37 + openstackdocstheme 38 + setuptools 39 + sphinxcontrib-apidoc 40 + sphinxHook 41 + ]; 42 + 43 + sphinxBuilders = [ "man" ]; 44 + 45 + dependencies = [ 33 46 cliff 34 47 dogpile-cache 35 48 jsonschema ··· 51 64 ]; 52 65 53 66 checkPhase = '' 67 + runHook preCheck 54 68 stestr run 69 + runHook postCheck 55 70 ''; 56 71 57 72 pythonImportsCheck = [ "ironicclient" ];
+9 -13
pkgs/development/python-modules/python-manilaclient/default.nix
··· 2 2 lib, 3 3 buildPythonPackage, 4 4 fetchPypi, 5 - installShellFiles, 6 5 pbr, 7 6 openstackdocstheme, 8 7 oslo-config, ··· 12 11 prettytable, 13 12 requests, 14 13 simplejson, 15 - sphinx, 14 + setuptools, 15 + sphinxHook, 16 16 sphinxcontrib-programoutput, 17 17 babel, 18 18 osc-lib, ··· 24 24 buildPythonPackage rec { 25 25 pname = "python-manilaclient"; 26 26 version = "4.9.1"; 27 - format = "setuptools"; 27 + pyproject = true; 28 28 29 29 src = fetchPypi { 30 30 inherit pname version; 31 31 hash = "sha256-TebykdG0fkeC+5Vs9eiwuJpXam41gg8gR4F2poYKDhI="; 32 32 }; 33 33 34 - nativeBuildInputs = [ 35 - installShellFiles 34 + build-system = [ 36 35 openstackdocstheme 37 - sphinx 36 + setuptools 37 + sphinxHook 38 38 sphinxcontrib-programoutput 39 39 ]; 40 40 41 - propagatedBuildInputs = [ 41 + sphinxBuilders = [ "man" ]; 42 + 43 + dependencies = [ 42 44 pbr 43 45 oslo-config 44 46 oslo-log ··· 52 54 python-keystoneclient 53 55 debtcollector 54 56 ]; 55 - 56 - postInstall = '' 57 - export PATH=$out/bin:$PATH 58 - sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man 59 - installManPage doc/build/man/python-manilaclient.1 60 - ''; 61 57 62 58 # Checks moved to 'passthru.tests' to workaround infinite recursion 63 59 doCheck = false;
+11 -12
pkgs/development/python-modules/python-openstackclient/default.nix
··· 3 3 buildPythonPackage, 4 4 fetchPypi, 5 5 ddt, 6 - installShellFiles, 7 6 openstackdocstheme, 8 7 osc-lib, 9 8 pbr, ··· 11 10 python-keystoneclient, 12 11 python-novaclient, 13 12 requests-mock, 14 - sphinx, 13 + setuptools, 14 + sphinxHook, 15 15 sphinxcontrib-apidoc, 16 16 stestr, 17 17 }: ··· 19 19 buildPythonPackage rec { 20 20 pname = "python-openstackclient"; 21 21 version = "6.6.0"; 22 - format = "setuptools"; 22 + pyproject = true; 23 23 24 24 src = fetchPypi { 25 25 inherit pname version; 26 26 hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw="; 27 27 }; 28 28 29 - nativeBuildInputs = [ 30 - installShellFiles 29 + build-system = [ 31 30 openstackdocstheme 32 - sphinx 31 + setuptools 32 + sphinxHook 33 33 sphinxcontrib-apidoc 34 34 ]; 35 35 36 - propagatedBuildInputs = [ 36 + sphinxBuilders = [ "man" ]; 37 + 38 + dependencies = [ 37 39 osc-lib 38 40 pbr 39 41 python-cinderclient ··· 41 43 python-novaclient 42 44 ]; 43 45 44 - postInstall = '' 45 - sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man 46 - installManPage doc/build/man/openstack.1 47 - ''; 48 - 49 46 nativeCheckInputs = [ 50 47 ddt 51 48 stestr ··· 53 50 ]; 54 51 55 52 checkPhase = '' 53 + runHook preCheck 56 54 stestr run 55 + runHook postCheck 57 56 ''; 58 57 59 58 pythonImportsCheck = [ "openstackclient" ];
+2
pkgs/development/python-modules/tempest/default.nix
··· 42 42 hash = "sha256-l4qKbTfQRWiRsoHN9fiAAiGMGP+q3gwRH1pMSXV/eSU="; 43 43 }; 44 44 45 + pythonRelaxDeps = [ "defusedxml" ]; 46 + 45 47 nativeBuildInputs = [ setuptools ]; 46 48 47 49 propagatedBuildInputs = [