gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update OpenStack clients (#403165)

Browse Source
This commit is contained in:
Sandro
2025-05-05 16:46:58 +02:00
committed by GitHub
parent 1fdfa71282 bd798bc09b
commit 8611d451b6
15 changed files with 53 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ko/kolla/package.nix
+12 -15
View File
@@ -1,23 +1,19 @@
{
lib,
python311Packages,
python3Packages,
fetchFromGitHub,
bashate,
}:
let
pythonPackages = python311Packages;
in
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "kolla";
version = "18.1.0";
version = "19.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openstack";
repo = "kolla";
hash = "sha256-jLD6ILihymQlWkkpGYC4OX8BKLpQurAK6Y5Xpju+QAI=";
hash = "sha256-yVNMCqg6eAUhLg3iAjDkYpMoIKc6OksDri9jNpyaS7c=";
rev = version;
};
@@ -26,21 +22,22 @@ pythonPackages.buildPythonApplication rec {
--replace-fail "os.path.join(sys.prefix, 'share/kolla')," \
"os.path.join(PROJECT_ROOT, '../../../share/kolla'),"
substituteInPlace test-requirements.txt \
--replace-fail "hacking>=3.0.1,<3.1.0" "hacking"
sed -e 's/git_info = .*/git_info = "${version}"/' -i kolla/version.py
'';
pythonRelaxDeps = [
"hacking"
];
# fake version to make pbr.packaging happy
env.PBR_VERSION = version;
build-system = with pythonPackages; [
build-system = with python3Packages; [
setuptools
pbr
];
dependencies = with pythonPackages; [
dependencies = with python3Packages; [
docker
jinja2
oslo-config
@@ -49,10 +46,10 @@ pythonPackages.buildPythonApplication rec {
];
postInstall = ''
cp kolla/template/repos.yaml $out/${pythonPackages.python.sitePackages}/kolla/template/
cp kolla/template/repos.yaml $out/${python3Packages.python.sitePackages}/kolla/template/
'';
nativeCheckInputs = with pythonPackages; [
nativeCheckInputs = with python3Packages; [
testtools
stestr
oslotest
pkgs/development/python-modules/osc-placement/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "osc-placement";
version = "4.5.0";
version = "4.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "openstack";
repo = "osc-placement";
tag = version;
hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI=";
hash = "sha256-8D/8WRUZnVTCXL/I+KmIGKtnfyjM7evux808+XY3ciw=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/oslo-context/default.nix
+5 -4
View File
@@ -10,13 +10,14 @@
}:
buildPythonPackage rec {
pname = "oslo.context";
version = "5.7.0";
pname = "oslo-context";
version = "5.7.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-OYxGC5z3yzl+3nliIj5LiAePsvvFNmWkejThsoiQ9M4=";
inherit version;
pname = "oslo_context";
hash = "sha256-DFEf4VNzKv8MGztEq9L1EAioPHB7uSm+4B4SVayWSIk=";
};
postPatch = ''
pkgs/development/python-modules/oslo-log/default.nix
+4 -2
View File
@@ -8,6 +8,7 @@
setuptools,
# dependencies
debtcollector,
oslo-config,
oslo-context,
oslo-serialization,
@@ -24,14 +25,14 @@
buildPythonPackage rec {
pname = "oslo-log";
version = "6.2.0";
version = "7.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openstack";
repo = "oslo.log";
tag = version;
hash = "sha256-IEhIhGE95zZiWp602rFc+NLco/Oyx9XEL5e2RExNBMs=";
hash = "sha256-ybWrNwP9L7iOzft10TgRFxA4mCRDVozVC2ZAopgITqo=";
};
# Manually set version because prb wants to get it from the git upstream repository (and we are
@@ -41,6 +42,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [
debtcollector
oslo-config
oslo-context
oslo-serialization
pkgs/development/python-modules/python-aodhclient/default.nix
+3 -3
View File
@@ -21,16 +21,16 @@
buildPythonPackage rec {
pname = "python-aodhclient";
version = "3.6.0";
version = "3.7.1";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-aodhclient";
tag = version;
hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8=";
hash = "sha256-99oErtl1clqsMx/ZOTJZ4sNOUqiE2t/NtDQDrZaIV3Y=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-barbicanclient/default.nix
+3 -3
View File
@@ -20,17 +20,17 @@
buildPythonPackage rec {
pname = "python-barbicanclient";
version = "7.0.0";
version = "7.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitea {
domain = "opendev.org";
owner = "openstack";
repo = "python-barbicanclient";
rev = version;
hash = "sha256-odoYyBulOQkjUpymFyZgvI+DYmdHJY3PaG8hh2ms+/0=";
hash = "sha256-VEK3MDuvciF4hpyNKTKWX2v3pSCcVi+YGgSKCLaWAuI=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-designateclient/default.nix
+3 -3
View File
@@ -22,17 +22,17 @@
buildPythonPackage rec {
pname = "python-designateclient";
version = "6.1.0";
version = "6.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitea {
domain = "opendev.org";
owner = "openstack";
repo = "python-designateclient";
rev = version;
hash = "sha256-MwcpRQXH8EjWv41iHxorbFL9EpYu8qOLkDeUx6inEAU=";
hash = "sha256-Upfu6FDaCRXniJLacuIt6K0qi8aOvHU0t43F3uWvhG8=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-magnumclient/default.nix
+2 -2
View File
@@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "python-magnumclient";
version = "4.7.0";
version = "4.8.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "openstack";
repo = "python-magnumclient";
tag = version;
hash = "sha256-2JHI3CB/DSZZ4LXzL3PCUSmubTciUXtZkc5jpeEc4kk=";
hash = "sha256-rXLJnvGc5VHkHghCoBLRhARwl3hhS/oI2VOsGWfESkM=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-mistralclient/default.nix
+2 -2
View File
@@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "python-mistralclient";
version = "5.3.0";
version = "5.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "openstack";
repo = "python-mistralclient";
rev = version;
hash = "sha256-Vi56+OlFU2Aj7yJ/cH5y0ZbzPhglTciJcTnkbA0S7Qo=";
hash = "sha256-c1kMDyRNMZKnDvL993WvZSsjkXgYLM2+9KBmF+I4vnM=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-troveclient/default.nix
+3 -3
View File
@@ -25,16 +25,16 @@
buildPythonPackage rec {
pname = "python-troveclient";
version = "8.6.0";
version = "8.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-troveclient";
tag = version;
hash = "sha256-6JviPG2ikKRqvW/eqPIHMvpV6GjqbaXYHhcOOpaIS4U=";
hash = "sha256-WBMXSZhkrKlEkVpy56zdBRzspUjUsj0dQ4OR250Fo+s=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-watcherclient/default.nix
+3 -3
View File
@@ -19,16 +19,16 @@
buildPythonPackage rec {
pname = "python-watcherclient";
version = "4.5.0";
version = "4.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-watcherclient";
tag = version;
hash = "sha256-lDdiZKaeteKZEyfjpBx8KY+0FLFOYAnQXl0pTbqq0Ss=";
hash = "sha256-ZwMsLXqfRw/qJ71B/WcLkK9TGX77GLiy/nLE7kRD1Xg=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-zaqarclient/default.nix
+3 -3
View File
@@ -22,16 +22,16 @@
buildPythonPackage rec {
pname = "python-zaqarclient";
version = "2.8.0";
version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-zaqarclient";
tag = version;
hash = "sha256-vfu1GYd9eoVpmBtlnRTiqpiqlgxqPnwpFC9YC1UuvLM=";
hash = "sha256-SYHFzl7av/D4/2Ovnv95Ed4vaTxv/ke6FKVg+MWlGBI=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/python-zunclient/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "python-zunclient";
version = "5.1.0";
version = "5.2.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "openstack";
repo = "python-zunclient";
tag = version;
hash = "sha256-2gC2aMaMI//QKIpbDNT9cii17680g4X1c0rgrgPbAsg=";
hash = "sha256-YdE5a/qm91Nv2TW9pot9sn5GwvnFuqPCgiuLF6O7reA=";
};
env.PBR_VERSION = version;
pkgs/development/python-modules/stestr/default.nix
+6 -17
View File
@@ -4,9 +4,7 @@
fetchPypi,
cliff,
fixtures,
future,
pbr,
setuptools,
flit-core,
subunit,
testtools,
tomlkit,
@@ -16,30 +14,21 @@
buildPythonPackage rec {
pname = "stestr";
version = "4.1.0";
version = "4.2.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-X2HDae7OY8KS0TWZ4SqhWK92hZkGQ/JN1vp/q/406Yo=";
hash = "sha256-Rexjny0cw3LjYwYTuT83zynT3+adSdTz+UCNN7Ebwpw=";
};
postPatch = ''
# only a small portion of the listed packages are actually needed for running the tests
# so instead of removing them one by one remove everything
rm test-requirements.txt
'';
nativeBuildInputs = [
pbr
setuptools
build-system = [
flit-core
];
propagatedBuildInputs = [
dependencies = [
cliff
fixtures
future
pbr
subunit
testtools
tomlkit
pkgs/development/python-modules/stestr/tests.nix
-6
View File
@@ -5,12 +5,6 @@ buildPythonPackage {
inherit (stestr) version src;
format = "other";
postPatch = ''
# only a small portion of the listed packages are actually needed for running the tests
# so instead of removing them one by one remove everything
rm test-requirements.txt
'';
dontBuild = true;
dontInstall = true;
preConfigure = ''