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

Update OpenStack clients (#427857)

parents 0c299dd1 d405385b

pkgs/development/python-modules/os-client-config/default.nix

+9 −14
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchpatch,

  fetchPypi,

  fixtures,

  hacking,

  jsonschema,

  openstacksdk,

  oslotest,

  pbr,

  python-glanceclient,

  setuptools,

  stestr,
@@ -18,31 +17,27 @@ 


buildPythonPackage rec {

  pname = "os-client-config";

  version = "2.1.0";

  version = "2.3.0";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-q8OKNR+MAG009+5fP2SN5ePs9kVcxdds/YidKRzfP04=";

    pname = "os_client_config";

    inherit version;

    hash = "sha256-4WomDy/VAK8U8Ve5t7fWkpLOg7D4pGHsaM5qikKWfL0=";

  };



  patches = [

    # Fix compatibility with openstacksdk 4.5.0

    (fetchpatch {

      url = "https://github.com/openstack/os-client-config/commit/46bc2deb4c6762dc1dd674686283eb3fa4c1d5e6.patch";

      hash = "sha256-wZdwCbgrRg0mxs542zjWAlXn0PzCotlbZaEyinYKwb4=";

    })

  build-system = [

    pbr

    setuptools

  ];



  build-system = [ setuptools ];



  dependencies = [

    openstacksdk

    pbr

    python-glanceclient

  ];



  nativeCheckInputs = [

    hacking

    fixtures

    jsonschema

    subunit

pkgs/development/python-modules/os-service-types/default.nix

+13 −6
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  callPackage,

  fetchPypi,

  pbr,

  setuptools,

  six,

  callPackage,

}:



buildPythonPackage rec {

  pname = "os-service-types";

  version = "1.7.0";

  format = "setuptools";

  version = "1.8.0";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    sha256 = "31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c";

    pname = "os_service_types";

    inherit version;

    hash = "sha256-iQznTxMsozTCsj8AJRErR8aSbabSjC91vPwKg96jYD4=";

  };



  postPatch = ''
@@ -23,7 +25,12 @@ buildPythonPackage rec { 
    rm test-requirements.txt

  '';



  propagatedBuildInputs = [

  build-system = [

    pbr

    setuptools

  ];



  dependencies = [

    pbr

    six

  ];

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

+2 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  buildPythonPackage,

  fetchPypi,

  debtcollector,

  netaddr,

  oslo-i18n,

  pbr,
@@ -16,13 +15,13 @@ 


buildPythonPackage rec {

  pname = "oslo-config";

  version = "9.8.0";

  version = "10.0.0";

  pyproject = true;



  src = fetchPypi {

    pname = "oslo_config";

    inherit version;

    hash = "sha256-7qgAlQSr7mchN8WL2r2roYX0lrk8ha3SRuLNzr6dCKo=";

    hash = "sha256-Mz5nXbjGvncVs97PeMOYyhE4Q5IlqidGMuiTFIN/bqM=";

  };



  postPatch = ''
@@ -34,7 +33,6 @@ buildPythonPackage rec { 
  build-system = [ setuptools ];



  dependencies = [

    debtcollector

    netaddr

    oslo-i18n

    pbr

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

+2 −11
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  stdenv,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,



  # build-system

  setuptools,
@@ -26,24 +25,16 @@ 


buildPythonPackage rec {

  pname = "oslo-log";

  version = "7.1.0";

  version = "7.2.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "openstack";

    repo = "oslo.log";

    tag = version;

    hash = "sha256-ybWrNwP9L7iOzft10TgRFxA4mCRDVozVC2ZAopgITqo=";

    hash = "sha256-d5U3zvymIoGYfXfHFp7+gQuDOLHy/q4c+NOlUoCmikU=";

  };



  patches = [

    # remove removed alias from tests

    (fetchpatch {

      url = "https://github.com/openstack/oslo.log/commit/69a285a8c830712b4b8aafc8ecd4e2d7654e1ffe.patch";

      hash = "sha256-e0kRSHJPHITP/XgPHhY5kGzCupE00oBnCJYiUCs3Yks=";

    })

  ];



  # Manually set version because prb wants to get it from the git upstream repository (and we are

  # installing from tarball instead)

  PBR_VERSION = version;

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

+4 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  buildPythonPackage,

  debtcollector,

  fetchFromGitea,

  fetchFromGitHub,

  jsonschema,

  keystoneauth1,

  openstackdocstheme,
@@ -22,16 +22,15 @@ 


buildPythonPackage rec {

  pname = "python-designateclient";

  version = "6.2.0";

  version = "6.3.0";

  pyproject = true;



  disabled = pythonOlder "3.9";



  src = fetchFromGitea {

    domain = "opendev.org";

  src = fetchFromGitHub {

    owner = "openstack";

    repo = "python-designateclient";

    rev = version;

    tag = version;

    hash = "sha256-Upfu6FDaCRXniJLacuIt6K0qi8aOvHU0t43F3uWvhG8=";

  };