dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pythonPackages: deprecate requests_toolbelt alias

Browse Source
This commit is contained in:
Sandro Jäckel 2021-07-20 23:21:18 +02:00
parent a5158b8c01
commit 703c108472
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
18 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/khal/default.nix
View File

@ -20,7 +20,7 @@ with python3.pkgs; buildPythonApplication rec {
pkgs.vdirsyncer pkgs.vdirsyncer
pytz pytz
pyxdg pyxdg
requests_toolbelt requests-toolbelt
tzlocal tzlocal
urwid urwid
pkginfo pkginfo

4
pkgs/applications/networking/sync/acd_cli/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonApplication, fuse { lib, fetchFromGitHub, buildPythonApplication, fuse
, appdirs, colorama, python-dateutil, requests, requests_toolbelt , appdirs, colorama, python-dateutil, requests, requests-toolbelt
, fusepy, sqlalchemy, setuptools }: , fusepy, sqlalchemy, setuptools }:
buildPythonApplication rec { buildPythonApplication rec {
@ -16,7 +16,7 @@ buildPythonApplication rec {
}; };
propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests
requests_toolbelt setuptools sqlalchemy ]; requests-toolbelt setuptools sqlalchemy ];
makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ];

4
pkgs/development/python-modules/argcomplete/default.nix
View File

@ -3,7 +3,7 @@
, importlib-metadata , importlib-metadata
, pexpect , pexpect
, prettytable , prettytable
, requests_toolbelt , requests-toolbelt
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "argcomplete"; pname = "argcomplete";
@ -24,7 +24,7 @@ buildPythonPackage rec {
importlib-metadata importlib-metadata
pexpect pexpect
prettytable prettytable
requests_toolbelt requests-toolbelt
]; ];
pythonImportsCheck = [ "argcomplete" ]; pythonImportsCheck = [ "argcomplete" ];

4
pkgs/development/python-modules/betamax-matchers/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi
, betamax, requests_toolbelt }: , betamax, requests-toolbelt }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "betamax-matchers"; pname = "betamax-matchers";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43";
}; };
buildInputs = [ betamax requests_toolbelt ]; buildInputs = [ betamax requests-toolbelt ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/sigmavirus24/betamax_matchers"; homepage = "https://github.com/sigmavirus24/betamax_matchers";

4
pkgs/development/python-modules/cherrypy/17.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildPythonPackage, fetchPypi { lib, stdenv, buildPythonPackage, fetchPypi
, setuptools-scm , setuptools-scm
, cheroot, contextlib2, portend, routes, six, zc_lockfile , cheroot, contextlib2, portend, routes, six, zc_lockfile
, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests_toolbelt , backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests-toolbelt
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -21,7 +21,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];
checkInputs = [ checkInputs = [
backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests_toolbelt backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests-toolbelt
]; ];
checkPhase = '' checkPhase = ''

4
pkgs/development/python-modules/cherrypy/default.nix
View File

@ -2,7 +2,7 @@
, setuptools-scm , setuptools-scm
, cheroot, portend, more-itertools, zc_lockfile, routes , cheroot, portend, more-itertools, zc_lockfile, routes
, jaraco_collections , jaraco_collections
, objgraph, pytest, pytest-cov, pathpy, requests_toolbelt, pytest-services , objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services
, fetchpatch , fetchpatch
}: }:
@ -47,7 +47,7 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
objgraph pytest pytest-cov pathpy requests_toolbelt pytest-services objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services
]; ];
# Keyboard interrupt ends test suite run # Keyboard interrupt ends test suite run

4
pkgs/development/python-modules/flickrapi/default.nix
View File

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, requests , requests
, requests_toolbelt , requests-toolbelt
, requests_oauthlib , requests_oauthlib
, pytest , pytest
, pytest-runner , pytest-runner
@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz"; sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz";
}; };
propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; propagatedBuildInputs = [ requests requests-toolbelt requests_oauthlib ];
checkInputs = [ pytest pytest-runner pytest-cov responses ]; checkInputs = [ pytest pytest-runner pytest-cov responses ];
doCheck = false; # Otherwise: doCheck = false; # Otherwise:

4
pkgs/development/python-modules/gradient/default.nix
View File

@ -15,7 +15,7 @@
, pyopenssl , pyopenssl
, pyyaml , pyyaml
, requests , requests
, requests_toolbelt , requests-toolbelt
, terminaltables , terminaltables
, websocket-client , websocket-client
}: }:
@ -53,7 +53,7 @@ buildPythonPackage rec {
pyopenssl pyopenssl
pyyaml pyyaml
requests requests
requests_toolbelt requests-toolbelt
terminaltables terminaltables
websocket-client websocket-client
]; ];

4
pkgs/development/python-modules/jira/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k { lib, buildPythonPackage, fetchPypi, isPy3k
, pytest, pytest-runner, pbr, glibcLocales , pytest-cov , pytest, pytest-runner, pbr, glibcLocales , pytest-cov
, requests, requests_oauthlib, requests_toolbelt, defusedxml , requests, requests_oauthlib, requests-toolbelt, defusedxml
, ipython , ipython
}: }:
@ -16,7 +16,7 @@ buildPythonPackage rec {
}; };
buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ];
propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ];
# impure tests because of connectivity attempts to jira servers # impure tests because of connectivity attempts to jira servers
doCheck = false; doCheck = false;

4
pkgs/development/python-modules/prawcore/default.nix
View File

@ -4,7 +4,7 @@
, requests , requests
, testfixtures , testfixtures
, mock , mock
, requests_toolbelt , requests-toolbelt
, betamax , betamax
, betamax-serializers , betamax-serializers
, betamax-matchers , betamax-matchers
@ -32,7 +32,7 @@ buildPythonPackage rec {
betamax betamax
betamax-serializers betamax-serializers
betamax-matchers betamax-matchers
requests_toolbelt requests-toolbelt
pytestCheckHook pytestCheckHook
]; ];

4
pkgs/development/python-modules/twine/default.nix
View File

@ -5,7 +5,7 @@
, pyblake2 , pyblake2
, readme_renderer , readme_renderer
, requests , requests
, requests_toolbelt , requests-toolbelt
, setuptools-scm , setuptools-scm
, tqdm , tqdm
, colorama , colorama
@ -30,7 +30,7 @@ buildPythonPackage rec {
pyblake2 pyblake2
readme_renderer readme_renderer
requests requests
requests_toolbelt requests-toolbelt
tqdm tqdm
colorama colorama
rfc3986 rfc3986

4
pkgs/development/python-modules/vdirsyncer/default.nix
View File

@ -6,7 +6,7 @@
, click , click
, click-log , click-log
, click-threading , click-threading
, requests_toolbelt , requests-toolbelt
, requests , requests
, requests_oauthlib # required for google oauth sync , requests_oauthlib # required for google oauth sync
, atomicwrites , atomicwrites
@ -34,7 +34,7 @@ buildPythonPackage rec {
click-threading click-threading
requests requests
requests_oauthlib # required for google oauth sync requests_oauthlib # required for google oauth sync
requests_toolbelt requests-toolbelt
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/webexteamssdk/default.nix
View File

@ -4,7 +4,7 @@
, future , future
, pyjwt , pyjwt
, requests , requests
, requests_toolbelt , requests-toolbelt
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -22,7 +22,7 @@ buildPythonPackage rec {
future future
pyjwt pyjwt
requests requests
requests_toolbelt requests-toolbelt
]; ];
# Tests require a Webex Teams test domain # Tests require a Webex Teams test domain

4
pkgs/development/python-modules/zeep/default.nix
View File

@ -19,7 +19,7 @@
, pythonOlder , pythonOlder
, pytz , pytz
, requests , requests
, requests_toolbelt , requests-toolbelt
, requests-file , requests-file
, requests-mock , requests-mock
, xmlsec , xmlsec
@ -47,7 +47,7 @@ buildPythonPackage rec {
lxml lxml
pytz pytz
requests requests
requests_toolbelt requests-toolbelt
requests-file requests-file
xmlsec xmlsec
]; ];

2
pkgs/development/tools/cloudsmith-cli/default.nix
View File

@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
colorama colorama
future future
requests requests
requests_toolbelt requests-toolbelt
semver semver
simplejson simplejson
six six

2
pkgs/top-level/all-packages.nix
View File

@ -22964,7 +22964,7 @@ in
acd-cli = callPackage ../applications/networking/sync/acd_cli { acd-cli = callPackage ../applications/networking/sync/acd_cli {
inherit (python3Packages) inherit (python3Packages)
buildPythonApplication appdirs colorama python-dateutil buildPythonApplication appdirs colorama python-dateutil
requests requests_toolbelt setuptools sqlalchemy fusepy; requests requests-toolbelt setuptools sqlalchemy fusepy;
}; };
adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };

1
pkgs/top-level/python-aliases.nix
View File

@ -60,6 +60,7 @@ mapAliases ({
pytest_xdist = pytest-xdist; # added 2021-01-04 pytest_xdist = pytest-xdist; # added 2021-01-04
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
requests_toolbelt = requests-toolbelt; # added 2017-09-26
rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10
setuptools_scm = setuptools-scm; # added 2021-06-03 setuptools_scm = setuptools-scm; # added 2021-06-03

2
pkgs/top-level/python-packages.nix
View File

@ -7551,8 +7551,6 @@ in {
requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { };
requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26
requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { };
requirements-detector = callPackage ../development/python-modules/requirements-detector { }; requirements-detector = callPackage ../development/python-modules/requirements-detector { };