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/development | |
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/development')
13 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 59f66f36d876..57431c2c2c25 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -6,7 +6,7 @@ , sh , coverage , docopt -, requests2 +, requests , git }: @@ -38,7 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ coverage docopt - requests2 + requests ]; meta = { diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix index 12c9aac4c23d..84c7b5ff38b5 100644 --- a/pkgs/development/python-modules/docker.nix +++ b/pkgs/development/python-modules/docker.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchurl -, six, requests2, websocket_client +, six, requests, websocket_client , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - requests2 + requests websocket_client ipaddress backports_ssl_match_hostname diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix index c21b69e1643e..9af95f72598f 100644 --- a/pkgs/development/python-modules/docker_compose.nix +++ b/pkgs/development/python-modules/docker_compose.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonApplication, fetchurl, pythonOlder , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt -, dockerpty, docker, ipaddress, jsonschema, requests2 +, dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property , enum34, functools32 }: @@ -19,7 +19,7 @@ buildPythonApplication rec { buildInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker - ipaddress jsonschema requests2 six texttable websocket_client + ipaddress jsonschema requests six texttable websocket_client docopt cached-property ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ++ diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 011c86652902..b25039cc71e8 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -17,7 +17,7 @@ , decorator , pathlib2 , pickleshare -, requests2 +, requests , simplegeneric , traitlets , prompt_toolkit @@ -45,7 +45,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit - simplegeneric traitlets requests2 pathlib2 pexpect + simplegeneric traitlets requests pathlib2 pexpect ] ++ lib.optionals stdenv.isDarwin [ appnope ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 0fa94854640b..3a24c5566bf0 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -15,7 +15,7 @@ , nbconvert , ipykernel , terminado -, requests2 +, requests , pexpect }: @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = [nose glibcLocales] ++ lib.optionals isPy27 [mock]; propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core - jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect ]; + jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 3c2e78ac1f1f..6e5627a58ca8 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -4,7 +4,7 @@ , decorator , nbformat , pytz -, requests2 +, requests , six }: @@ -22,7 +22,7 @@ buildPythonPackage rec { decorator nbformat pytz - requests2 + requests six ]; diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix index 0abf54f03fe1..87c0c3db264f 100644 --- a/pkgs/development/python-modules/pyrax.nix +++ b/pkgs/development/python-modules/pyrax.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring, +{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring, rackspace-novaclient, six, isPy3k, pytest, glibcLocales }: buildPythonPackage rec { name = "pyrax-1.9.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; disabled = isPy3k; - propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ]; + propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ]; LC_ALL = "en_US.UTF-8"; buildInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index a31c9ba35bbe..34a2bf7e31cb 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -6,7 +6,7 @@ , decorator , httpbin , six -, requests2 +, requests }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; buildInputs = [ pytest ]; - propagatedBuildInputs = [ flask decorator httpbin six requests2 ]; + propagatedBuildInputs = [ flask decorator httpbin six requests ]; meta = { description = "Easily test your HTTP library against a local copy of httpbin.org"; diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient.nix index 0eaed7e36fd9..144b61c9b9a5 100644 --- a/pkgs/development/python-modules/rackspace-novaclient.nix +++ b/pkgs/development/python-modules/rackspace-novaclient.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchurl, isPy3k, requests2, novaclient, six, lib }: +{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }: let os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec { name = "os_virtual_interfacesv2_python_novaclient_ext-0.20"; @@ -129,7 +129,7 @@ buildPythonPackage rec { disabled = isPy3k; propagatedBuildInputs = [ - requests2 + requests novaclient six # extensions diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix index a353ebd39d9b..62ecf134b49e 100644 --- a/pkgs/development/python-modules/requests-oauthlib.nix +++ b/pkgs/development/python-modules/requests-oauthlib.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchurl -, oauthlib, requests2 }: +, oauthlib, requests }: buildPythonPackage rec { version = "0.7.0"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; doCheck = false; # Internet tests fail when building in chroot - propagatedBuildInputs = [ oauthlib requests2 ]; + propagatedBuildInputs = [ oauthlib requests ]; meta = with stdenv.lib; { description = "OAuthlib authentication support for Requests"; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 37f9e3324c7e..14a2ac9cb92d 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2, +{ stdenv, fetchurl, buildPythonPackage, service-identity, requests, six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx, openssl, pyopenssl }: @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ service-identity - requests2 + requests twisted incremental sphinx diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 850affb06108..94960e1b74da 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1"; }; - propagatedBuildInputs = with pythonPackages; [ futures requests2 six tqdm ]; + propagatedBuildInputs = with pythonPackages; [ futures requests six tqdm ]; checkPhase = '' python test_b2_command_line.py test diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 417e492f7d0b..69cc2db3ff28 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { }; propagatedBuildInputs = with pythonPackages; [ - requests2 fasteners pyyaml pyjwt colorama patch + requests fasteners pyyaml pyjwt colorama patch bottle pluginbase six distro pylint node-semver ]; |