oslo-config: 4.11.0 -> 4.12.0, fix build

also updated the following dependencies:
keystoneauth1: 3.1.0 -> 3.2.0
  disabled tests which require oslo-config, oslo-test or requests-kerberos
oslo-i18n: 2.7.0 -> 3.18.0
oslotest: 1.12.0 -> 2.18.0
os-client-config: 1.8.1 -> 1.28.0
  needed to disable testing due to circular dependency with oslotest
mox3: 0.11.0 -> 0.23.0
  disable tests for py36 due to upstream bug
debtcollector: 0.9.0 -> 1.17.0
  tests enabled

extra packages:
requestsexceptions: init at 1.3.0
This commit is contained in:
makefu
2017-09-20 14:52:04 +02:00
parent d757d8142e
commit 7251699081
4 changed files with 63 additions and 31 deletions

View File

@@ -6,20 +6,21 @@
buildPythonPackage rec {
pname = "keystoneauth1";
version = "3.1.0";
version = "3.2.0";
name = "${pname}-${version}";
disabled = isPyPy; # a test fails
src = fetchPypi {
inherit pname version;
sha256 = "e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb";
sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n";
};
buildInputs = [ pbr testtools testresources testrepository mock
pep8 fixtures mox3 requests-mock ];
propagatedBuildInputs = [ iso8601 requests six stevedore
webob oslo-config ];
propagatedBuildInputs = [ iso8601 requests six stevedore webob ];
# oslo_config is required but would create a circular dependency
doCheck = false;
postPatch = ''
sed -i 's@python@${python.interpreter}@' .testr.conf
substituteInPlace requirements.txt --replace "argparse" ""

View File

@@ -1,16 +1,17 @@
{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock }:
{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock,
debtcollector, rfc3986, pyyaml, oslo-i18n }:
buildPythonPackage rec {
pname = "oslo.config";
version = "4.11.0";
version = "4.12.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1be8aaba466a3449fdb21ee8f7025b0d3d252c8c7568b8d5d05ceff58617cd05";
sha256 = "1pa9lajsadyq47bmxx12dxlcmnqsqlgnb55hwqas26lgnb2073dx";
};
propagatedBuildInputs = [ pbr six netaddr stevedore ];
propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ];
buildInputs = [ mock ];
# TODO: circular import on oslo-i18n
@@ -20,6 +21,4 @@ buildPythonPackage rec {
substituteInPlace requirements.txt --replace "argparse" ""
'';
# Requires a bunch of new packages
meta.broken = true;
}

View File

@@ -0,0 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, pbr }:
buildPythonPackage rec {
pname = "requestsexceptions";
version = "1.3.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "0gim00vi7vfq16y8b9m1vpy01grqvrdrbh88jb98qx6n6sk1n54g";
};
propagatedBuildInputs = [ pbr ];
# upstream hacking package is not required for functional testing
patchPhase = ''
sed -i '/^hacking/d' test-requirements.txt
'';
meta = with lib; {
description = "Import exceptions from potentially bundled packages in requests.";
homepage = "https://pypi.python.org/pypi/requestsexceptions";
license = licenses.asl20;
maintainers = with maintainers; [ makefu ];
patforms = platforms.all;
};
}