Unverified Commit 8611d451 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Update OpenStack clients (#403165)

parents 1fdfa712 bd798bc0

pkgs/by-name/ko/kolla/package.nix

+12 −15
Original line number Diff line number Diff line 
{

  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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;