Skip to content

Commit 98841c3

Browse files
committed
python312Packages.python-aodhclient: fix package build
1 parent 1bda871 commit 98841c3

2 files changed

Lines changed: 61 additions & 20 deletions

File tree

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,47 @@
11
{
22
lib,
33
buildPythonPackage,
4-
cliff,
54
fetchFromGitHub,
6-
keystoneauth1,
7-
openstackdocstheme,
5+
pbr,
6+
setuptools,
7+
8+
# direct
9+
cliff,
810
osc-lib,
911
oslo-i18n,
1012
oslo-serialization,
1113
oslo-utils,
12-
oslotest,
1314
osprofiler,
14-
pbr,
15+
keystoneauth1,
1516
pyparsing,
16-
setuptools,
17+
18+
# tests
19+
stestrCheckHook,
20+
versionCheckHook,
21+
openstacksdk,
22+
oslotest,
23+
tempest,
24+
testtools,
25+
pifpaf,
26+
27+
# docs
1728
sphinxHook,
18-
stestr,
29+
openstackdocstheme,
1930
}:
2031

21-
buildPythonPackage rec {
32+
buildPythonPackage (finalAttrs: {
2233
pname = "python-aodhclient";
2334
version = "3.10.1";
2435
pyproject = true;
2536

2637
src = fetchFromGitHub {
2738
owner = "openstack";
2839
repo = "python-aodhclient";
29-
tag = version;
40+
tag = finalAttrs.version;
3041
hash = "sha256-xm42ZicdBxxm4LTDHPhEIeNU6evBZtp2PGvGy6V2t8c=";
3142
};
3243

33-
env.PBR_VERSION = version;
44+
env.PBR_VERSION = finalAttrs.version;
3445

3546
build-system = [
3647
pbr
@@ -44,6 +55,10 @@ buildPythonPackage rec {
4455

4556
sphinxBuilders = [ "man" ];
4657

58+
patches = [
59+
./fix-pyproject.patch
60+
];
61+
4762
dependencies = [
4863
cliff
4964
keystoneauth1
@@ -57,23 +72,31 @@ buildPythonPackage rec {
5772
];
5873

5974
nativeCheckInputs = [
75+
stestrCheckHook
76+
openstacksdk
6077
oslotest
61-
stestr
78+
tempest
79+
testtools
80+
pifpaf
6281
];
6382

64-
checkPhase = ''
65-
runHook preCheck
66-
stestr run
67-
runHook postCheck
68-
'';
83+
nativeInstallCheckInputs = [ versionCheckHook ];
84+
doInstallCheck = true;
6985

70-
pythonImportsCheck = [ "aodhclient" ];
86+
pythonImportsCheck = [
87+
"aodhclient"
88+
"aodhclient.v2"
89+
"aodhclient.tests"
90+
"aodhclient.tests.functional"
91+
"aodhclient.tests.unit"
92+
];
7193

7294
meta = {
73-
homepage = "https://github.com/openstack/python-aodhclient";
74-
description = "Client library for OpenStack Aodh API";
95+
description = "Client library for OpenStack AOodh API";
96+
homepage = "https://docs.openstack.org/python-aodhclient/latest/";
97+
downloadPage = "https://github.com/openstack/python-aodhclientz /releases/tag/${finalAttrs.src.tag}";
7598
license = lib.licenses.asl20;
7699
mainProgram = "aodh";
77100
teams = [ lib.teams.openstack ];
78101
};
79-
}
102+
})
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/pyproject.toml b/pyproject.toml
2+
index 877242f..b5707c0 100644
3+
--- a/pyproject.toml
4+
+++ b/pyproject.toml
5+
@@ -33,10 +33,9 @@ classifiers = [
6+
Homepage = "https://docs.openstack.org/python-aodhclient"
7+
Repository = "https://opendev.org/openstack/python-aodhclient"
8+
9+
-[tool.setuptools]
10+
-packages = [
11+
- "aodhclient"
12+
-]
13+
+[tool.setuptools.packages.find]
14+
+where = ["."]
15+
+include = ["aodhclient*"]
16+
17+
[project.scripts]
18+
aodh = "aodhclient.shell:main"

0 commit comments

Comments
 (0)