Skip to content

Commit 631ebd8

Browse files
barbicanclient: 7.1.0 -> 7.2.0, mistralclient: 5.4.0 -> 6.0.0, magnumclient: 4.8.1 -> 4.9.0 (#439968)
2 parents 714e7c1 + 0e8a08b commit 631ebd8

File tree

5 files changed

+25
-32
lines changed

5 files changed

+25
-32
lines changed

pkgs/development/python-modules/python-barbicanclient/default.nix

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
lib,
33
buildPythonPackage,
44
cliff,
5-
fetchFromGitea,
5+
fetchFromGitHub,
66
keystoneauth1,
77
openstackdocstheme,
88
oslo-i18n,
99
oslo-serialization,
1010
oslo-utils,
1111
pbr,
12-
pythonOlder,
1312
requests-mock,
1413
requests,
1514
setuptools,
@@ -20,17 +19,14 @@
2019

2120
buildPythonPackage rec {
2221
pname = "python-barbicanclient";
23-
version = "7.1.0";
22+
version = "7.2.0";
2423
pyproject = true;
2524

26-
disabled = pythonOlder "3.9";
27-
28-
src = fetchFromGitea {
29-
domain = "opendev.org";
25+
src = fetchFromGitHub {
3026
owner = "openstack";
3127
repo = "python-barbicanclient";
32-
rev = version;
33-
hash = "sha256-VEK3MDuvciF4hpyNKTKWX2v3pSCcVi+YGgSKCLaWAuI=";
28+
tag = version;
29+
hash = "sha256-HhWWUM0lK0B0ySItrT6z5QCXzStuiJzDZFoEb+WRodA=";
3430
};
3531

3632
env.PBR_VERSION = version;

pkgs/development/python-modules/python-magnumclient/default.nix

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
fetchFromGitHub,
77
fixtures,
88
keystoneauth1,
9+
openstacksdk,
910
openstackdocstheme,
10-
os-client-config,
1111
osc-lib,
1212
oslo-i18n,
1313
oslo-log,
@@ -18,7 +18,6 @@
1818
pbr,
1919
prettytable,
2020
python-openstackclient,
21-
pythonOlder,
2221
requests-mock,
2322
requests,
2423
setuptools,
@@ -30,16 +29,14 @@
3029

3130
buildPythonPackage rec {
3231
pname = "python-magnumclient";
33-
version = "4.8.1";
32+
version = "4.9.0";
3433
pyproject = true;
3534

36-
disabled = pythonOlder "3.8";
37-
3835
src = fetchFromGitHub {
3936
owner = "openstack";
4037
repo = "python-magnumclient";
4138
tag = version;
42-
hash = "sha256-rXLJnvGc5VHkHghCoBLRhARwl3hhS/oI2VOsGWfESkM=";
39+
hash = "sha256-Ok211QgvsKqkotXrC4HwMyonLv7LzuCjs2hjruGDEvY=";
4340
};
4441

4542
env.PBR_VERSION = version;
@@ -60,7 +57,7 @@ buildPythonPackage rec {
6057
cryptography
6158
decorator
6259
keystoneauth1
63-
os-client-config
60+
openstacksdk
6461
osc-lib
6562
oslo-i18n
6663
oslo-log

pkgs/development/python-modules/python-mistralclient/default.nix

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
lib,
33
buildPythonPackage,
44
cliff,
5-
fetchFromGitea,
5+
fetchFromGitHub,
66
keystoneauth1,
77
openstackdocstheme,
8-
os-client-config,
8+
openstacksdk,
99
osc-lib,
1010
oslo-i18n,
1111
oslo-serialization,
1212
oslo-utils,
1313
oslotest,
1414
osprofiler,
1515
pbr,
16-
pythonOlder,
1716
pyyaml,
1817
requests-mock,
1918
requests,
@@ -27,17 +26,14 @@
2726

2827
buildPythonPackage rec {
2928
pname = "python-mistralclient";
30-
version = "5.4.0";
29+
version = "6.0.0";
3130
pyproject = true;
3231

33-
disabled = pythonOlder "3.8";
34-
35-
src = fetchFromGitea {
36-
domain = "opendev.org";
32+
src = fetchFromGitHub {
3733
owner = "openstack";
3834
repo = "python-mistralclient";
39-
rev = version;
40-
hash = "sha256-c1kMDyRNMZKnDvL993WvZSsjkXgYLM2+9KBmF+I4vnM=";
35+
tag = version;
36+
hash = "sha256-zdCqBua6S+a7iS3VzELM02oJKwLlI24tHWfx4Pt3nQw=";
4137
};
4238

4339
env.PBR_VERSION = version;
@@ -69,7 +65,7 @@ buildPythonPackage rec {
6965
];
7066

7167
nativeCheckInputs = [
72-
os-client-config
68+
openstacksdk
7369
oslotest
7470
osprofiler
7571
requests-mock

pkgs/development/python-modules/python-neutronclient/default.nix

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
lib,
33
buildPythonPackage,
4-
fetchPypi,
4+
fetchFromGitHub,
55
setuptools,
66
# Build and Runtime
77
pbr,
@@ -36,12 +36,15 @@ buildPythonPackage rec {
3636
version = "11.6.0";
3737
pyproject = true;
3838

39-
src = fetchPypi {
40-
pname = "python_neutronclient";
41-
inherit version;
42-
hash = "sha256-PGlYCI0YyGdqEKv52UuNvxqYR0HLuYhVTyFogHl+By8=";
39+
src = fetchFromGitHub {
40+
owner = "openstack";
41+
repo = "python-neutronclient";
42+
tag = version;
43+
hash = "sha256-nz7KiFe8IWJypGCjFgrEgGTEsC0xlW3YG/QRNJUzcpc=";
4344
};
4445

46+
env.PBR_VERSION = version;
47+
4548
build-system = [
4649
setuptools
4750
pbr

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8690,6 +8690,7 @@ with pkgs;
86908690
magnumclient = with python313Packages; toPythonApplication python-magnumclient;
86918691
manilaclient = with python313Packages; toPythonApplication python-manilaclient;
86928692
mistralclient = with python313Packages; toPythonApplication python-mistralclient;
8693+
neutronclient = with python313Packages; toPythonApplication python-neutronclient;
86938694
swiftclient = with python313Packages; toPythonApplication python-swiftclient;
86948695
troveclient = with python313Packages; toPythonApplication python-troveclient;
86958696
watcherclient = with python313Packages; toPythonApplication python-watcherclient;

0 commit comments

Comments
 (0)