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

Merge pull request #334247 from anthonyroussel/openstack-update

parents 15dd3c43 913a7502

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

+4 −4
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 


buildPythonPackage rec {

  pname = "keystoneauth1";

  version = "5.6.0";

  version = "5.7.0";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-7LfzR1nr4QPbNyqwlTwLghkp3dSX8zKqaz72yqz/7Yg=";

    hash = "sha256-sswtaNGkjpwsbZsbH9ANfHvf4IboBAtR5wk4qLo639E=";

  };



  postPatch = ''
@@ -40,9 +40,9 @@ buildPythonPackage rec { 
    rm test-requirements.txt

  '';



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    betamax

    iso8601

    lxml

pkgs/development/python-modules/osc-lib/default.nix

+14 −7
Original line number Diff line number Diff line
@@ -7,34 +7,41 @@ 
  oslo-utils,

  openstacksdk,

  pbr,

  pythonOlder,

  requests-mock,

  simplejson,

  setuptools,

  requests,

  stestr,

}:



buildPythonPackage rec {

  pname = "osc-lib";

  version = "2.8.0";

  format = "setuptools";

  version = "3.1.0";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "openstack";

    repo = "osc-lib";

    rev = version;

    hash = "sha256-ijL/m9BTAgDUjqy77nkl3rDppeUPBycmEqlL6uMruIA=";

    hash = "sha256-DDjWM4hjHPXYDeAJ6FDZZPzi65DG1rJ3efs8MouX1WY=";

  };



  # fake version to make pbr.packaging happy and not reject it...

  PBR_VERSION = version;



  nativeBuildInputs = [ pbr ];

  build-system = [

    pbr

    setuptools

  ];



  propagatedBuildInputs = [

  dependencies = [

    cliff

    openstacksdk

    oslo-i18n

    oslo-utils

    simplejson

    requests

  ];



  nativeCheckInputs = [

pkgs/development/python-modules/oslo-config/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -9,19 +9,20 @@ 
  pyyaml,

  requests,

  rfc3986,

  setuptools,

  stevedore,

  callPackage,

}:



buildPythonPackage rec {

  pname = "oslo-config";

  version = "9.4.0";

  format = "setuptools";

  version = "9.5.0";

  pyproject = true;



  src = fetchPypi {

    pname = "oslo.config";

    inherit version;

    hash = "sha256-NbEaZhtgjttQMF2tkeTjCBnZDveUt9fbpb2LLvLrjA0=";

    hash = "sha256-qlAARIhrbFX3ZXfLWpNJKkWWxfkoM3Z2DqeFLMScmaM=";

  };



  postPatch = ''
@@ -30,7 +31,9 @@ buildPythonPackage rec { 
    rm test-requirements.txt

  '';



  propagatedBuildInputs = [

  build-system = [ setuptools ];



  dependencies = [

    debtcollector

    netaddr

    oslo-i18n

pkgs/development/python-modules/oslo-log/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -14,22 +14,25 @@ 
  python-dateutil,

  pytestCheckHook,

  pythonOlder,

  setuptools,

}:



buildPythonPackage rec {

  pname = "oslo-log";

  version = "6.0.0";

  format = "setuptools";

  version = "6.1.1";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchPypi {

    pname = "oslo.log";

    inherit version;

    hash = "sha256-ifDW+iy6goH4m1CKf+Sb+5far1XFJ4GH1FowaZceaH8=";

    hash = "sha256-41oSz+TK0T/7Cu2pn8yiCnBdD2lKhMLvewe0WWD4j7Q=";

  };



  propagatedBuildInputs = [

  build-system = [ setuptools ];



  dependencies = [

    oslo-config

    oslo-context

    oslo-serialization

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

+4 −4
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
  python-ironicclient,

  python-keystoneclient,

  python-manilaclient,

  python-novaclient,

  python-openstackclient,

  requests-mock,

  requests,

  setuptools,

  sphinxHook,

  sphinxcontrib-apidoc,
@@ -25,12 +25,12 @@ 


buildPythonPackage rec {

  pname = "python-openstackclient";

  version = "6.6.0";

  version = "7.0.0";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw=";

    hash = "sha256-1HDjWYySnZI/12j9+Gb1G9NKkb+xfrcMoTY/q7aL0uA=";

  };



  build-system = [
@@ -47,7 +47,7 @@ buildPythonPackage rec { 
    pbr

    python-cinderclient

    python-keystoneclient

    python-novaclient

    requests

  ];



  nativeCheckInputs = [