mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
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:
parent
d757d8142e
commit
7251699081
@ -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" ""
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
};
|
||||
}
|
@ -14852,14 +14852,14 @@ in {
|
||||
|
||||
oslo-i18n = buildPythonPackage rec {
|
||||
name = "oslo.i18n-${version}";
|
||||
version = "2.7.0";
|
||||
version = "3.18.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/o/oslo.i18n/${name}.tar.gz";
|
||||
sha256 = "11jgcvj36g97awh7fpar4xxgwrvzfahq6rw7xxqac32ia790ylcz";
|
||||
sha256 = "19w6wil588fgppc7d42fqkrjs0y81ap62svzbij8hlb3w2d4a91n";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ pbr Babel six oslo-config ];
|
||||
propagatedBuildInputs = with self; [ pbr Babel six ];
|
||||
buildInputs = with self; [ mock coverage oslotest ];
|
||||
patchPhase = ''
|
||||
sed -i 's@python@${python.interpreter}@' .testr.conf
|
||||
@ -14870,11 +14870,11 @@ in {
|
||||
|
||||
oslotest = buildPythonPackage rec {
|
||||
name = "oslotest-${version}";
|
||||
version = "1.12.0";
|
||||
version = "2.18.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/o/oslotest/${name}.tar.gz";
|
||||
sha256 = "17i92hymw1dwmmb5yv90m2gam2x21mc960q1pr7bly93x49h8666";
|
||||
sha256 = "0a0zhpb4yp7g6d290jk7a4pfci4ciwhsrqzhbwbl2szi50gp7km1";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
@ -14882,28 +14882,27 @@ in {
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with self; [ pbr fixtures subunit six testrepository
|
||||
testscenarios testtools mock mox3 oslo-config os-client-config ];
|
||||
os-client-config debtcollector testscenarios testtools mock mox3 os-client-config ];
|
||||
};
|
||||
|
||||
os-client-config = buildPythonPackage rec {
|
||||
name = "os-client-config-${version}";
|
||||
version = "1.8.1";
|
||||
version = "1.28.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/o/os-client-config/${name}.tar.gz";
|
||||
sha256 = "10hz4yp594mi1p7v1pvgsmx5w2rnb9y8d0jvb2lfv03ljnwzv8jz";
|
||||
sha256 = "1f7q384b9drp3fqcg0w8aihv9k4idaay8vr3an187zjpgbx9rgp5";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures ];
|
||||
propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 ];
|
||||
# requires oslotest but is a dependency of that package ...
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures jsonschema ];
|
||||
propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 requestsexceptions ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's@python@${python.interpreter}@' .testr.conf
|
||||
'';
|
||||
# TODO: circular import on oslotest
|
||||
preCheck = ''
|
||||
rm os_client_config/tests/{test_config,test_cloud_config,test_environ}.py
|
||||
'';
|
||||
};
|
||||
|
||||
keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {};
|
||||
@ -14927,38 +14926,42 @@ in {
|
||||
|
||||
mox3 = buildPythonPackage rec {
|
||||
name = "mox3-${version}";
|
||||
version = "0.11.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/m/mox3/${name}.tar.gz";
|
||||
sha256 = "09dkgki21v5zqrx575h1aazxsq5akkv0a90z644bk1ry9a4zg1pn";
|
||||
sha256 = "0q26sg0jasday52a7y0cch13l0ssjvr4yqnvswqxsinj1lv5ld88";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's@python@${python.interpreter}@' .testr.conf
|
||||
'';
|
||||
|
||||
# FAIL: mox3.tests.test_mox.RegexTest.testReprWithFlags
|
||||
# ValueError: cannot use LOCALE flag with a str pattern
|
||||
doCheck = !isPy36;
|
||||
|
||||
buildInputs = with self; [ subunit testrepository testtools six ];
|
||||
propagatedBuildInputs = with self; [ pbr fixtures ];
|
||||
};
|
||||
|
||||
debtcollector = buildPythonPackage rec {
|
||||
name = "debtcollector-${version}";
|
||||
version = "0.9.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/d/debtcollector/${name}.tar.gz";
|
||||
sha256 = "1mvdxdrnwlgfqg26s5himkjq6f06r2khlrignx36kkbyaix6j9xb";
|
||||
sha256 = "0rh47fd5kgjcdv9dxr7xf0x308cvfic3h2zk03ifvb4pdc5kbqvi";
|
||||
};
|
||||
patchPhase = ''
|
||||
sed -i 's@python@${python.interpreter}@' .testr.conf
|
||||
'';
|
||||
|
||||
buildInputs = with self; [ pbr ];
|
||||
propagatedBuildInputs = with self; [ wrapt Babel six doc8 ];
|
||||
propagatedBuildInputs = with self; [ wrapt Babel six doc8 ] ++
|
||||
(optional (isPy26 || isPy27) funcsigs);
|
||||
checkInputs = with self; [ pbr Babel six wrapt testtools testscenarios
|
||||
testrepository subunit coverage oslotest ];
|
||||
doCheck = false; # oslo is broken
|
||||
testrepository subunit coverage ];
|
||||
};
|
||||
|
||||
doc8 = callPackage ../development/python-modules/doc8 { };
|
||||
@ -18363,6 +18366,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
requestsexceptions = callPackage ../development/python-modules/requestsexceptions {};
|
||||
|
||||
requests_ntlm = callPackage ../development/python-modules/requests_ntlm { };
|
||||
|
||||
requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
|
||||
|
Loading…
Reference in New Issue
Block a user