diff options
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 403 |
1 files changed, 132 insertions, 271 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 609338d911c1..5493d10709c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -446,7 +446,7 @@ in { name = "acme-${version}"; propagatedBuildInputs = with self; [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock + cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock ndg-httpsclient ]; @@ -524,7 +524,7 @@ in { sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09"; }; - propagatedBuildInputs = with self; [ requests2 pyjwt ]; + propagatedBuildInputs = with self; [ requests pyjwt ]; meta = { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; @@ -1613,7 +1613,7 @@ in { sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24"; }; - propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests2 ]; + propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; meta = { description = "Microsoft Azure SDK for Python"; @@ -1665,7 +1665,7 @@ in { url = mirror://pypi/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip; sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; }; - propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests2 ]; + propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -1801,7 +1801,7 @@ in { url = mirror://pypi/a/azure-storage/azure-storage-0.20.3.zip; sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; }; - propagatedBuildInputs = with self; [ azure-common futures dateutil requests2 ]; + propagatedBuildInputs = with self; [ azure-common futures dateutil requests ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; @@ -1820,7 +1820,7 @@ in { url = mirror://pypi/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip; sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs"; }; - propagatedBuildInputs = with self; [ azure-common requests2 ]; + propagatedBuildInputs = with self; [ azure-common requests ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; @@ -2090,7 +2090,7 @@ in { sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz"; }; - propagatedBuildInputs = [ self.requests2 ]; + propagatedBuildInputs = [ self.requests ]; doCheck = false; @@ -2523,7 +2523,7 @@ in { }; buildInputs = with self; [ pillow tox mock six nose ]; - propagatedBuildInputs = with self; [ requests2 decorator simplejson ]; + propagatedBuildInputs = with self; [ requests decorator simplejson ]; meta = { description = "The Datadog Python library "; @@ -2565,7 +2565,7 @@ in { sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ requests2 lxml pbr ]; + propagatedBuildInputs = with self; [ requests lxml pbr ]; # prompt_toolkit doesn't work on 3.5 on OSX. doCheck = !isPy35; @@ -2609,7 +2609,7 @@ in { sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; }; - propagatedBuildInputs = with self; [ cookies mock requests2 six ]; + propagatedBuildInputs = with self; [ cookies mock requests six ]; doCheck = false; @@ -2732,7 +2732,7 @@ in { sha256 = "d881e21ec7ebfa006cfca6d10a5b7229aa59990568f8c6b8e3364769fa38b6f6"; }; - propagatedBuildInputs = [ self.requests2 ]; + propagatedBuildInputs = [ self.requests ]; # No tests doCheck = false; @@ -2793,7 +2793,7 @@ in { psutil pymongo pyyaml - requests2 + requests sqlalchemy tables toolz @@ -2983,7 +2983,7 @@ in { werkzeug itsdangerous dateutil - requests2 + requests six pygments pystache @@ -3023,7 +3023,7 @@ in { ''; buildInputs = [ self.nose self.mock ]; - propagatedBuildInputs = [ self.requests2 self.httpretty ]; + propagatedBuildInputs = [ self.requests self.httpretty ]; meta = { homepage = https://github.com/boto/boto; @@ -3088,7 +3088,7 @@ in { propagatedBuildInputs = [ self.dateutil - self.requests2 + self.requests self.jmespath ]; @@ -3167,7 +3167,7 @@ in { buildInputs = with self; [ mock unittest2 nose /* jira megaplan */ ]; propagatedBuildInputs = with self; [ - twiggy requests2 offtrac bugzilla taskw dateutil pytz keyring six + twiggy requests offtrac bugzilla taskw dateutil pytz keyring six jinja2 pycurl dogpile_cache lockfile click pyxdg ]; @@ -3213,7 +3213,7 @@ in { patches = [ ../development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch ]; buildInputs = with self; [ pep8 coverage logilab_common ]; - propagatedBuildInputs = [ self.requests2 ]; + propagatedBuildInputs = [ self.requests ]; preCheck = '' mkdir -p check-phase @@ -3229,9 +3229,6 @@ in { }; }; - buildout = self.zc_buildout; - buildout152 = self.zc_buildout152; - check-manifest = buildPythonPackage rec { name = "check-manifest"; version = "0.30"; @@ -3260,7 +3257,7 @@ in { sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j"; }; - propagatedBuildInputs = [ self.requests2 self.py ]; + propagatedBuildInputs = [ self.requests self.py ]; meta = { homepage = https://bitbucket.org/hpk42/devpi; @@ -3273,9 +3270,8 @@ in { # A patched version of buildout, useful for buildout based development on Nix zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - zc_recipe_egg = self.zc_recipe_egg_buildout171; - zc_buildout = self.zc_buildout171; - zc_buildout2 = self.zc_buildout221; + zc_buildout = self.zc_buildout221; + zc_buildout221 = buildPythonPackage rec { name = "zc.buildout-2.2.1"; @@ -3292,72 +3288,6 @@ in { }; }; - zc_buildout171 = buildPythonPackage rec { - name = "zc.buildout-1.7.1"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zc.buildout/${name}.tar.gz"; - sha256 = "a5c2fafa4d073ad3dabec267c44a996cbc624700a9a49467cd6b1ef63d35e029"; - }; - - meta = { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpt21; - maintainers = with maintainers; [ garbas ]; - }; - }; - - zc_buildout152 = buildPythonPackage rec { - name = "zc.buildout-1.5.2"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zc.buildout/${name}.tar.gz"; - sha256 = "0ac5a325d3ffbc5a988fb3ba87f4159d4769cc73e3331cb5234edc8839b6506b"; - }; - - # TODO: consider if this patch should be an option - # It makes buildout useful in a nix profile, but this alters the default functionality - patchPhase = '' - sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py - ''; - - meta = { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpt21; - maintainers = with maintainers; [ garbas ]; - }; - }; - - zc_recipe_egg_fun = { buildout, version, sha256 }: buildPythonPackage rec { - inherit version; - name = "zc.recipe.egg-${version}"; - - buildInputs = with self; [ buildout ]; - doCheck = false; - - src = pkgs.fetchurl { - inherit sha256; - url = "mirror://pypi/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz"; - }; - meta.broken = true; # https://bitbucket.org/pypa/setuptools/issues/462/pkg_resourcesfind_on_path-thinks-the - }; - zc_recipe_egg_buildout171 = self.zc_recipe_egg_fun { - buildout = self.zc_buildout171; - version = "1.3.2"; - sha256 = "12zl16fdz85l6hgrkqwily7d2brr9w5pdfqri5n978gh36mqf526"; - }; - zc_recipe_egg_buildout2 = self.zc_recipe_egg_fun { - buildout = self.zc_buildout2; - version = "2.0.3"; - sha256 = "0d7xkxxhm5bwrscchjzc88559njirqxishdwl2qjx3gij3s12l5s"; - }; - bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; meta.maintainers = with maintainers; [ mornfall ]; @@ -3703,7 +3633,7 @@ in { sed -i 's/==/>=/' requirements.txt ''; - propagatedBuildInputs = with self; [ docopt requests2 pygments ]; + propagatedBuildInputs = with self; [ docopt requests pygments ]; # Error when running tests: # No local packages or download links found for requests @@ -4173,7 +4103,7 @@ in { sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh"; }; - buildInputs = with self; [ requests2 six pytest ]; + buildInputs = with self; [ requests six pytest ]; # No tests distributed. https://github.com/cablehead/python-consul/issues/133 doCheck = false; @@ -4473,7 +4403,7 @@ in { propagatedBuildInputs = with self; [ pbr stevedore netaddr iso8601 six oslo-i18n oslo-utils Babel pyyaml eventlet - requests2 urllib3 oslo-concurrency suds-jurko + requests urllib3 oslo-concurrency suds-jurko ]; buildInputs = with self; [ bandit oslosphinx coverage testtools testscenarios testrepository mock @@ -4491,7 +4421,7 @@ in { }; propagatedBuildInputs = with self; [ - pbr argparse requests2 six keystoneclient cliff oslo-i18n oslo-serialization + pbr argparse requests six keystoneclient cliff oslo-i18n oslo-serialization oslo-utils ]; buildInputs = with self; [ @@ -4541,7 +4471,7 @@ in { buildInputs = with self; [ pbr testtools testscenarios testrepository requests-mock fixtures ]; propagatedBuildInputs = with self; [ - Babel argparse prettytable requests2 simplejson six iso8601 + Babel argparse prettytable requests simplejson six iso8601 keystoneclient tempest-lib ]; # TODO: check if removing this test is really harmless @@ -4652,7 +4582,7 @@ in { propagatedBuildInputs = with self; [ pbr six Babel cliff os-client-config oslo-config oslo-i18n oslo-utils - glanceclient keystoneclient novaclient cinderclient neutronclient requests2 + glanceclient keystoneclient novaclient cinderclient neutronclient requests stevedore cliff-tablib ]; buildInputs = with self; [ @@ -5273,7 +5203,7 @@ in { version = "1.1.0"; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests2 ]; + propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests ]; meta = { description = "Extensible server fixures for py.test"; @@ -5391,7 +5321,7 @@ in { }; propagatedBuildInputs = with self; [ werkzeug ]; - buildInputs = with self; [ pytest six requests2 ]; + buildInputs = with self; [ pytest six requests ]; checkPhase = '' py.test @@ -5629,7 +5559,7 @@ in { digital-ocean = buildPythonPackage rec { name = "python-digitalocean-1.10.1"; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; # Package doesn't distribute tests. doCheck = false; @@ -5774,7 +5704,7 @@ in { buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ requests2 six urllib3 ]; + propagatedBuildInputs = with self; [ requests six urllib3 ]; meta = { description = "Persistent cache for requests library"; @@ -6122,7 +6052,7 @@ in { sha256 = "0a3616a818dd9fa61a61c3d9731d176e9123130d1b1b97a6beee63b4c72306b7"; }; - propagatedBuildInputs = with self; [ oauth2 requests2 ]; + propagatedBuildInputs = with self; [ oauth2 requests ]; meta = { description = "Official Python API client for Discogs"; @@ -6231,7 +6161,7 @@ in { doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy setuptools backports_lzma m2crypto + requests rsa sqlalchemy setuptools backports_lzma m2crypto ]; patchPhase = "> requirements/main.txt"; @@ -6328,7 +6258,7 @@ in { sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; }; - propagatedBuildInputs = with self; [ requests2 six ]; + propagatedBuildInputs = with self; [ requests six ]; meta = { description = "Digital Ocean API python wrapper"; @@ -6401,7 +6331,7 @@ in { sha256 = "f65c12bd97f09e29a951bc7cb30a74e005fc4b2f8bb48778796be3f73866b173"; }; - propagatedBuildInputs = with self; [ requests2 urllib3 mock setuptools ]; + propagatedBuildInputs = with self; [ requests urllib3 mock setuptools ]; meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; @@ -6499,7 +6429,7 @@ in { # Check is disabled because running them destroy the content of the local cluster! # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch doCheck = false; - propagatedBuildInputs = with self; [ urllib3 requests2 ]; + propagatedBuildInputs = with self; [ urllib3 requests ]; buildInputs = with self; [ nosexcover mock ]; meta = { @@ -6581,7 +6511,7 @@ in { sed -i -e '13,14d;37d' setup.py ''; - propagatedBuildInputs = with self; [ simplejson pytz requests2 ]; + propagatedBuildInputs = with self; [ simplejson pytz requests ]; # No proper tests are available doCheck = false; @@ -6886,7 +6816,7 @@ in { }; disabled = !isPy3k; - propagatedBuildInputs = with self; [ docutils requests2 requests_download zipfile36]; + propagatedBuildInputs = with self; [ docutils requests requests_download zipfile36]; meta = { description = "A simple packaging tool for simple packages"; @@ -7159,7 +7089,7 @@ in { mutagen protobuf3_0 setuptools - requests2 + requests dateutil proboscis mock @@ -7330,7 +7260,7 @@ in { pyasn1 pycparser pycryptodome - requests2 + requests six ]; @@ -7354,7 +7284,7 @@ in { }; buildInputs = with self; [ pytest responses ]; - propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests2 ]; + propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests ]; checkPhase = '' export PATH="$PATH:$out/bin" @@ -7619,7 +7549,7 @@ in { sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126"; }; - propagatedBuildInputs = with self; [ six requests2 ]; + propagatedBuildInputs = with self; [ six requests ]; meta = { description = "A python client library for the IPFS API"; @@ -7721,7 +7651,7 @@ in { ''; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ six clint pyyaml docopt requests2 jsonpatch args ]; + propagatedBuildInputs = with self; [ six clint pyyaml docopt requests jsonpatch args ]; meta = with stdenv.lib; { description = "A python wrapper for the various Internet Archive APIs"; @@ -7889,6 +7819,8 @@ in { libsexy = pkgs.libsexy; }; + libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; + libthumbor = buildPythonPackage rec { name = "libthumbor-${version}"; version = "1.2.0"; @@ -8408,7 +8340,26 @@ in { }; }; - pants = buildPythonPackage rec { + pants = let + # Get rid of this when pants 1.3.0 is released and make 0.5 the default + pathspec = buildPythonPackage rec { + pname = "pathspec"; + version = "0.3.4"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; + }; + + meta = { + description = "Utility library for gitignore-style pattern matching of file paths"; + homepage = "https://github.com/cpburnz/python-path-specification"; + license = licenses.mpl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + in buildPythonPackage rec { pname = "pantsbuild.pants"; version = "1.2.1"; name = "${pname}-${version}"; @@ -8429,7 +8380,7 @@ in { propagatedBuildInputs = with self; [ ansicolors beautifulsoup4 cffi coverage docutils fasteners futures isort lmdb markdown mock packaging pathspec pep8 pex psutil pyflakes - pygments pystache pytestcov pytest pywatchman requests2 scandir + pygments pystache pytestcov pytest pywatchman requests scandir setproctitle setuptools six thrift wheel twitter-common-dirutil twitter-common-confluence twitter-common-collections ]; @@ -8463,7 +8414,7 @@ in { propagatedBuildInputs = with self; [ twitter-common-collections setproctitle setuptools six ansicolors - packaging pathspec_0_5 scandir twitter-common-dirutil psutil requests2 + packaging pathspec scandir twitter-common-dirutil psutil requests pystache pex docutils markdown pygments twitter-common-confluence fasteners coverage pywatchman futures cffi ]; @@ -8512,33 +8463,14 @@ in { }; }; - # Get rid of this when pants 1.3.0 is released and make 0.5 the default pathspec = buildPythonPackage rec { pname = "pathspec"; - version = "0.3.4"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; - }; - - meta = { - description = "Utility library for gitignore-style pattern matching of file paths"; - homepage = "https://github.com/cpburnz/python-path-specification"; - license = licenses.mpl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; - - pathspec_0_5 = buildPythonPackage rec { - pname = "pathspec"; - version = "0.5.0"; + version = "0.5.2"; name = "${pname}-${version}"; src = self.fetchPypi { inherit pname version; - sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma"; + sha256 = "f9fdf4408f4adb30e9f507f61d3a41c968e9c6e6c519d4bbd2a189627b5e86f0"; }; meta = { @@ -9568,7 +9500,7 @@ in { rev = version; sha256 = "1mnl0rfbnimcpp7q9hva0x9jfa58j4nc27r9kvaii8869kzssw48"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; prePatch = '' sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py sed -i -e "s|notify-send|${pkgs.libnotify}/bin/notify-send|" py3status/modules/battery_level.py @@ -10530,7 +10462,7 @@ in { pygments simplejson dateutil - requests2 + requests sqlparse jinja2 autopep8 @@ -11607,7 +11539,7 @@ in { sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63"; }; - buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests2 testtools]; + buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests testtools]; propagatedBuildInputs = with self; [ six python_mimeparse ]; # The travis build fails since the migration from multiprocessing to threading for hosting the API under test. @@ -11628,7 +11560,7 @@ in { sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c"; }; - propagatedBuildInputs = with self; [ falcon requests2 ]; + propagatedBuildInputs = with self; [ falcon requests ]; # tests are not shipped in the tarball doCheck = false; @@ -12174,7 +12106,7 @@ in { buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers ]; - propagatedBuildInputs = with self; [ requests2 pyopenssl uritemplate_py + propagatedBuildInputs = with self; [ requests pyopenssl uritemplate_py ndg-httpsclient requests_toolbelt pyasn1 ]; postPatch = '' @@ -12567,7 +12499,7 @@ in { sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; }; hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; @@ -12670,7 +12602,7 @@ in { sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7"; }; - buildInputs = with self; [ tornado requests2 httplib2 sure nose coverage certifi ]; + buildInputs = with self; [ tornado requests httplib2 sure nose coverage certifi ]; propagatedBuildInputs = with self; [ urllib3 ]; @@ -12785,7 +12717,7 @@ in { # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = with self; [ requests2 dateutil pytz six ]; + propagatedBuildInputs = with self; [ requests dateutil pytz six ]; meta = { description = "Python client for InfluxDB"; @@ -13512,7 +13444,7 @@ in { doCheck = false; propagatedBuildInputs = with self; [ - click watchdog exifread requests2 mistune inifile Babel jinja2 + click watchdog exifread requests mistune inifile Babel jinja2 flask pyopenssl ndg-httpsclient pkgs.glibcLocales ]; }; @@ -13615,7 +13547,7 @@ in { sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; meta = { homepage = "https://github.com/ghickman/linode"; @@ -13675,30 +13607,6 @@ in { }; }; - # Old version needed for attic (backup program) due to breaking change in - # llfuse >= 0.42. - llfuse-0-41 = buildPythonPackage rec { - name = "llfuse-0.41.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; - }; - buildInputs = with self; [ pytest pkgs.pkgconfig pkgs.fuse pkgs.attr pkgs.which ]; - propagatedBuildInputs = with self; [ contextlib2 ]; - checkPhase = '' - py.test - ''; - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' - doCheck = false; - meta = { - description = "Python bindings for the low-level FUSE API"; - homepage = https://code.google.com/p/python-llfuse/; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - locustio = buildPythonPackage rec { name = "locustio-0.7.2"; @@ -13707,7 +13615,7 @@ in { sha256 = "c9ca6fdfe6a6fb187a3d54ddf9b1518196348e8f20537f0a14ca81a264ffafa2"; }; - propagatedBuildInputs = [ self.msgpack self.requests2 self.flask self.gevent self.pyzmq ]; + propagatedBuildInputs = [ self.msgpack self.requests self.flask self.gevent self.pyzmq ]; buildInputs = [ self.mock self.unittest2 ]; meta = { @@ -13814,6 +13722,8 @@ in { }; }); + ltc_scrypt = callPackage ../development/python-modules/ltc_scrypt/default.nix { }; + python_magic = buildPythonPackage rec { name = "python-magic-0.4.10"; @@ -14094,7 +14004,7 @@ in { sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd"; }; - propagatedBuildInputs = with self; [ requests2 beautifulsoup4 six ]; + propagatedBuildInputs = with self; [ requests beautifulsoup4 six ]; meta = { description = "A Python library for automating interaction with websites"; @@ -14174,7 +14084,7 @@ in { buildInputs = with self; [ pyflakes pep8 ]; propagatedBuildInputs = with self; [ django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 - requests2 requests_oauthlib future pillow + requests requests_oauthlib future pillow ]; # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ @@ -14335,7 +14245,7 @@ in { buildInputs = with self; [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales - pillow twitter pyfiglet requests2 arrow dateutil pysocks + pillow twitter pyfiglet requests arrow dateutil pysocks pocket ]; @@ -14357,7 +14267,7 @@ in { }; buildInputs = with self; [ - requests2 + requests ]; meta = { @@ -14582,7 +14492,7 @@ in { propagatedBuildInputs = with self; [ # Main dependencies - jinja2 werkzeug flask requests2 six boto httpretty xmltodict + jinja2 werkzeug flask requests six boto httpretty xmltodict # For tests nose sure boto3 freezegun ]; @@ -14962,7 +14872,7 @@ in { buildInputs = with self; [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; - propagatedBuildInputs = with self; [ six requests2 requests_oauthlib ]; + propagatedBuildInputs = with self; [ six requests requests_oauthlib ]; checkPhase = '' py.test @@ -15828,7 +15738,7 @@ in { sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc"; }; - propagatedBuildInputs = with self; [ appdirs pyyaml requests2 dbus-python emoji sleekxmpp mock ]; + propagatedBuildInputs = with self; [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ]; meta = { description = "A utility for sending notifications, on demand and when commands finish"; @@ -16075,7 +15985,7 @@ in { buildInputs = [ pkgs.makeWrapper ]; - propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests2 ] + propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests ] ++ optionals isPy26 [ singledispatch futures argparse ] ++ optionals isPy27 [ singledispatch futures ] ++ optionals isPy33 [ singledispatch ]; @@ -16469,7 +16379,7 @@ in { doCheck = false; propagatedBuildInputs = with self; [ - pbr requests2 sphinx_1_2 + pbr requests sphinx_1_2 ]; }; @@ -16765,7 +16675,7 @@ in { }; propagatedBuildInputs = with self; [ - six Babel simplejson requests2 keystoneclient prettytable argparse pbr + six Babel simplejson requests keystoneclient prettytable argparse pbr ]; buildInputs = with self; [ testrepository requests-mock @@ -16791,7 +16701,7 @@ in { }; propagatedBuildInputs = with self; [ - pbr six simplejson keystoneclient requests2 oslo-utils oslo-serialization + pbr six simplejson keystoneclient requests oslo-utils oslo-serialization oslo-i18n netaddr iso8601 cliff argparse ]; buildInputs = with self; [ @@ -16909,7 +16819,7 @@ in { }; propagatedBuildInputs = with self; [ - oslo-i18n oslo-utils six requests2 keystoneclient prettytable Babel pbr + oslo-i18n oslo-utils six requests keystoneclient prettytable Babel pbr argparse warlock ]; buildInputs = with self; [ @@ -17178,7 +17088,7 @@ in { }; propagatedBuildInputs = with self; [ - pbr requests2 futures six + pbr requests futures six ]; buildInputs = with self; [ testtools testrepository mock @@ -17417,7 +17327,7 @@ in { }; propagatedBuildInputs = with self; [ - requests2 oslo-config oslo-i18n oslo-serialization oslo-utils six + requests oslo-config oslo-i18n oslo-serialization oslo-utils six ]; buildInputs = with self; [ oslosphinx httpretty oslotest @@ -17670,7 +17580,7 @@ in { buildInputs = with self; [ pbr testtools testresources testrepository mock pep8 fixtures mox3 requests-mock ]; - propagatedBuildInputs = with self; [ argparse iso8601 requests2 six stevedore + propagatedBuildInputs = with self; [ argparse iso8601 requests six stevedore webob oslo-config ]; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf @@ -17691,7 +17601,7 @@ in { ''; buildInputs = with self; [ pbr testtools testrepository mock ]; - propagatedBuildInputs = with self; [ six requests2 ]; + propagatedBuildInputs = with self; [ six requests ]; }; mox3 = buildPythonPackage rec { @@ -18528,7 +18438,7 @@ in { sha256 = "f3a646871f9baed05f336a32576edaab90abf0737d8adb54f2acb7bcad42a65f"; }; - propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama]; + propagatedBuildInputs = with self; [ click_5 requests bottle pyserial lockfile colorama]; meta = with stdenv.lib; { description = "An open source ecosystem for IoT development"; @@ -18879,7 +18789,7 @@ in { }; propagatedBuildInputs = with self; [ - requests2 + requests decorator flake8 mock @@ -19103,7 +19013,7 @@ in { sha256 = "0117039cb116af245e6866e8e8bf3c9c8b2853ad087142bd0c2dfc0acc09d452"; }; - propagatedBuildInputs = with self; [ requests2 audioread ]; + propagatedBuildInputs = with self; [ requests audioread ]; patches = [ ../development/python-modules/pyacoustid-py3.patch ]; @@ -19214,7 +19124,7 @@ in { propagatedBuildInputs = with self; [ repoze_who paste cryptography pycrypto pyopenssl ipaddress six cffi idna - enum34 pytz setuptools zope_interface dateutil requests2 pyasn1 webob decorator pycparser + enum34 pytz setuptools zope_interface dateutil requests pyasn1 webob decorator pycparser defusedxml ]; buildInputs = with self; [ @@ -21746,8 +21656,6 @@ in { }; }; - requests = self.requests2; - # Remove before release of 17.09 requests_1 = buildPythonPackage rec { name = "requests-1.2.3"; @@ -21764,7 +21672,10 @@ in { }; }; - requests2 = buildPythonPackage rec { + requests2 = throw "requests2 has been deprecated. Use requests instead."; + + # use requests, not requests_2 + requests = buildPythonPackage rec { name = "requests-${version}"; version = "2.13.0"; @@ -21796,7 +21707,7 @@ in { sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; meta = { description = "Download files using requests and save them to a target path"; @@ -21817,7 +21728,7 @@ in { sha256 = "16grklnbgcfwqj3f39gw7fc9afi7xlp9gm7x8w6mi81dzhdxf50y"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; buildInputs = with self; [ betamax mock pytest ]; @@ -22027,7 +21938,7 @@ in { sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; # no tests in tarball doCheck = false; @@ -22101,7 +22012,7 @@ in { }; propagatedBuildInputs = with self; [ - requests2 + requests ]; buildInputs = with self; [ @@ -22430,7 +22341,7 @@ in { }; buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ robotframework lxml requests2 ]; + propagatedBuildInputs = with self; [ robotframework lxml requests ]; meta = { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; @@ -23720,7 +23631,7 @@ in { sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg"; }; - propagatedBuildInputs = with self; [ six requests2 mock unittest2 ]; + propagatedBuildInputs = with self; [ six requests mock unittest2 ]; # FIXME doCheck = false; @@ -24265,7 +24176,7 @@ in { sqlalchemy whoosh imagesize - requests2 + requests ]; # https://github.com/NixOS/nixpkgs/issues/22501 @@ -25076,7 +24987,7 @@ in { oslotest pep8 ]; propagatedBuildInputs = with self; [ oslo-serialization oslo-config oslo-i18n oslo-utils - Babel argparse prettytable requests2 six iso8601 stevedore + Babel argparse prettytable requests six iso8601 stevedore netaddr debtcollector bandit webob mock pycrypto ]; patchPhase = '' @@ -25114,7 +25025,7 @@ in { ]; propagatedBuildInputs = with self; [ pbr Babel oslo-config oslo-context oslo-i18n oslo-serialization oslo-utils - requests2 six webob keystoneclient pycadf oslo-messaging + requests six webob keystoneclient pycadf oslo-messaging ]; # lots of "unhashable type" errors @@ -25596,7 +25507,7 @@ in { }; doCheck = false; - propagatedBuildInputs = with self; [ requests2 six requests_oauthlib ]; + propagatedBuildInputs = with self; [ requests six requests_oauthlib ]; meta = { homepage = "https://github.com/tweepy/tweepy"; @@ -25773,7 +25684,7 @@ in { sha256 = "68b663691a947b844f92853c992d42bb68b6333bffc9ab7f661346b001c1da82"; }; - propagatedBuildInputs = with self; [ clint pkginfo requests2 requests_toolbelt ]; + propagatedBuildInputs = with self; [ clint pkginfo requests requests_toolbelt ]; # Requires network doCheck = false; @@ -25985,7 +25896,7 @@ in { sha256 = "681bc7c26cffd1564eb6f0f3170d975a31c2a9f2224a32f80fe954232b86f173"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; doCheck = false; @@ -26285,7 +26196,7 @@ EOF sha256 = "991bc2f1dc824c63e9b399f9e8606deded92a52378d0e449f258807d7556b039"; }; - propagatedBuildInputs = with self; [ requests2 six]; + propagatedBuildInputs = with self; [ requests six]; # No tests included doCheck = false; @@ -26309,7 +26220,7 @@ EOF sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; # Tests disabled. They fail because they try to access the network doCheck = false; @@ -26528,7 +26439,7 @@ EOF LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = with self; [ itsdangerous ]; - buildInputs = with self; [ pytest requests2 pkgs.glibcLocales ]; + buildInputs = with self; [ pytest requests pkgs.glibcLocales ]; @@ -27502,7 +27413,7 @@ EOF tunigo = buildPythonPackage rec { name = "tunigo-${version}"; version = "1.0.0"; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; src = pkgs.fetchFromGitHub { owner = "trygveaa"; @@ -28090,7 +28001,7 @@ EOF url = "mirror://pypi/t/${pname}/${name}.tar.gz"; sha256 = "0kkxxd17ar5gyjkz9yrrdr15a64qw6ym60ndi0zbwx2s634yfafw"; }; - propagatedBuildInputs = with self; [ twisted requests2 cryptography ]; + propagatedBuildInputs = with self; [ twisted requests cryptography ]; # Require network access doCheck = false; @@ -28492,7 +28403,7 @@ EOF ''; propagatedBuildInputs = with self; [ - pyyaml lxml grequests flaskbabel flask requests2 + pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; @@ -28534,7 +28445,7 @@ EOF # No tests in archive doCheck = false; - propagatedBuildInputs = with self; [ requests2 gevent ]; + propagatedBuildInputs = with self; [ requests gevent ]; meta = { description = "Asynchronous HTTP requests"; @@ -28767,56 +28678,6 @@ EOF }; }; - boto-230 = buildPythonPackage rec { - name = "boto-2.30.0"; - disabled = ! isPy27; - src = pkgs.fetchurl { - url = mirror://pypi/b/boto/boto-2.30.0.tar.gz; - sha256 = "12gl8azmx1vv8dbv9jhnsbhjpc2dd1ng0jlbcg734k6ggwq1h6hh"; - }; - doCheck = false; - meta = { - homepage = https://github.com/boto/boto; - license = licenses.mit; - description = "Python interface to Amazon Web Services"; - }; - }; - - gcs-oauth2-boto-plugin = buildPythonPackage rec { - name = "gcs-oauth2-boto-plugin-1.8"; - disabled = ! isPy27; - src = pkgs.fetchurl { - url = mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz; - sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb"; - }; - propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pyopenssl socksipy-branch ]; - meta = { - homepage = https://developers.google.com/storage/docs/gspythonlibrary; - description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; - license = licenses.asl20; - }; - }; - - gsutil = buildPythonPackage rec { - name = "gsutil-4.6"; - disabled = ! isPy27; - meta = { - homepage = https://developers.google.com/storage/docs/gsutil; - description = "Google Cloud Storage Tool"; - maintainers = with maintainers; [ roconnor ]; - license = licenses.asl20; - }; - doCheck = false; - - src = pkgs.fetchurl { - url = mirror://pypi/g/gsutil/gsutil-4.6.tar.gz; - sha256 = "1i0clm60162rbk45ljr8nsw4ndkzjnwb7r440shcqjrvw8jq49mn"; - }; - - propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags - retry_decorator pyopenssl socksipy-branch crcmod ]; - }; - svg2tikz = self.buildPythonPackage { name = "svg2tikz-1.0.0"; disabled = ! isPy27; @@ -29129,7 +28990,7 @@ EOF setupPyBuildFlags = ["--qt" "--xdg"]; - propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ]; + propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ]; meta = { homepage = http://weboob.org; @@ -29666,7 +29527,7 @@ EOF sha256 = "0fcc78b8dfc87237942aad2a8be54dbc08bc4afceaa7f6897f3d894e7d4bfd22"; }; - propagatedBuildInputs = with self; [ pytz requests2 ]; + propagatedBuildInputs = with self; [ pytz requests ]; buildInputs = with self; [ coverage mock nose unittest2 ]; @@ -29990,7 +29851,7 @@ EOF version = "0.4.5"; doCheck = false; #test needs packages too explicit buildInputs = with self; [ d2to1 ]; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; src = pkgs.fetchurl { url = "mirror://pypi/o/ovh/ovh-${version}.tar.gz"; @@ -30468,7 +30329,7 @@ EOF dateutil inflection more-itertools - requests2 + requests pandas ]; @@ -31072,7 +30933,7 @@ EOF sha256 = "063cbzp1fbdipv53gb0hnban1pg80pls0lbld98lhnykzkcb6vf0"; }; - propagatedBuildInputs = with self; [ websocket_client requests2 ]; + propagatedBuildInputs = with self; [ websocket_client requests ]; }; tempora = buildPythonPackage rec { @@ -31100,7 +30961,7 @@ EOF sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; }; - propagatedBuildInputs = with self; [ requests2 six dateutil ]; + propagatedBuildInputs = with self; [ requests six dateutil ]; }; pivy = buildPythonPackage rec { @@ -31148,7 +31009,7 @@ EOF buildInputs = [ python pkgs.makeWrapper ]; - propagatedBuildInputs = with self; [ docopt requests2 smugpy ]; + propagatedBuildInputs = with self; [ docopt requests smugpy ]; installPhase = '' mkdir -p $out/bin $out/libexec @@ -31283,7 +31144,7 @@ EOF url = "mirror://pypi/p/pwntools/${name}.tar.gz"; sha256 = "1siyky6iq2b155sfjhx10yg2ihvjp2s3kr6i0n5z9v5pi0r7gc6d"; }; - propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests2 tox pkgs.pandoc ]; + propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc ]; disabled = isPy3k; |