diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 12:55:45 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 12:56:09 +0200 |
| commit | ef4442e827af928a3fd394cb0731b554a31e8d5b (patch) | |
| tree | 4aa8f846f6a3074b4dc99fb16dd14bdc78ac3dd6 /pkgs/applications/virtualization | |
| parent | 024ddb32a7137c81c0e86ba59876c0cf4d5425e7 (diff) | |
| download | nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.gz nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.bz2 nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.lz nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.xz nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.zst nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.zip | |
Python: replace requests2 with requests tree-wide
See f63eb5857352705665411130d4f1638d55dd8c58 The `requests2` attribute now throws an error informing that `requests` should be used instead.
Diffstat (limited to 'pkgs/applications/virtualization')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index f78e5da9a8c0..21cb4906d034 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = with python2Packages; [ - Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8 + Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8 testresources testscenarios testtools psutil_1 oslotest psycopg2 sqlite which strace ]; diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 3a5941880795..39c54f0d204b 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec { buildInputs = with python2Packages; [ coverage fixtures mock subunit tempest-lib testtools testrepository - ldap ldappool webtest requests2 oslotest pep8 pymongo which + ldap ldappool webtest requests oslotest pep8 pymongo which ]; makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"]; diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index c1ee231d97f5..9ee586cf0409 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt propagatedBuildInputs = with python2Packages; [ - pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2 + pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six stevedore pecan ryu networking-hyperv MySQL_python diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index 219026f1e0fb..ef3eb2fb0842 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr - netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six + netifaces paramiko Babel iso8601 jsonschema keystoneclient requests six stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql keystonemiddleware MySQL_python |