diff options
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 951 |
1 files changed, 590 insertions, 361 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aee320cea1fe..e7ee93e21fec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -37,9 +37,29 @@ let graphiteVersion = "0.9.15"; + fetchPypi = {format ? "setuptools", ... } @attrs: + let + fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: + # Fetch a wheel. By default we fetch an universal wheel. + # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. + let + url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + in pkgs.fetchurl {inherit url sha256;}; + + fetchSource = {pname, version, sha256}: + # Fetch a source tarball. + let + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + in pkgs.fetchurl {inherit url sha256;}; + fetcher = (if format == "wheel" then fetchWheel + else if format == "setuptools" then fetchSource + else throw "Unsupported kind ${kind}"); + in fetcher (builtins.removeAttrs attrs ["format"]); + in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit fetchPypi; # helpers @@ -132,6 +152,23 @@ in { }; }; + ansicolor = buildPythonPackage rec { + name = "ansicolor-${version}"; + version = "0.2.4"; + + src = pkgs.fetchurl{ + url = "mirror://pypi/a/ansicolor/${name}.tar.gz"; + sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; + }; + + meta = { + homepage = "https://github.com/numerodix/ansicolor/"; + description = "A library to produce ansi color output and colored highlighting and diffing"; + license = licenses.asl20; + maintainers = with maintainers; [ andsild ]; + }; + }; + # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; @@ -294,8 +331,9 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; pytimeparse = buildPythonPackage rec { - name = "pytimeparse-1.1.5"; - disabled = isPy3k; + pname = "pytimeparse"; + version = "1.1.6"; + name = "${pname}-${version}"; meta = { description = "A small Python library to parse various kinds of time expressions"; @@ -306,9 +344,9 @@ in { propagatedBuildInputs = with self; [ nose ]; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytimeparse/${name}.tar.gz"; - sha256 = "01xj31m5brydm4gvc6lwx26r74903wvm1jx3g05633k3mqlvvpcs"; + src = fetchPypi { + inherit pname version; + sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; }; }; @@ -514,13 +552,13 @@ in { }; afew = buildPythonPackage rec { - rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128"; - name = "afew-git-2016-02-29"; + name = "afew-git-2017-02-08"; - src = pkgs.fetchurl { - url = "https://github.com/teythoon/afew/tarball/${rev}"; - name = "${name}.tar.bz"; - sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k"; + src = pkgs.fetchFromGitHub { + owner = "afewmail"; + repo = "afew"; + rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67"; + sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm"; }; buildInputs = with self; [ pkgs.dbacl ]; @@ -635,6 +673,24 @@ in { }; }; + ansicolors = buildPythonPackage rec { + name = "ansicolors-${version}"; + version = "1.0.2"; + + src = self.fetchPypi { + pname = "ansicolors"; + inherit version; + sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n"; + }; + + meta = { + homepage = "https://github.com/verigak/colors/"; + description = "ANSI colors for Python"; + license = licenses.isc; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + asgiref = buildPythonPackage rec { name = "asgiref-${version}"; version = "1.0.0"; @@ -805,7 +861,7 @@ in { alot = buildPythonPackage rec { - rev = "0.3.7"; + rev = "0.5"; name = "alot-${rev}"; disabled = isPy3k; @@ -814,7 +870,7 @@ in { owner = "pazz"; repo = "alot"; inherit rev; - sha256 = "0sscmmf42gsrjbisi6wm01alzlnq6wqhpwkm8pc557075jfg19il"; + sha256 = "1hzajfh0f21k97xip9blg7zifiv3y5k33swp2h9sc57qd7qkr5i6"; }; postPatch = '' @@ -831,6 +887,7 @@ in { self.python_magic self.configobj self.pygpgme + self.mock ]; postInstall = '' @@ -895,7 +952,7 @@ in { sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ vine ]; meta = { @@ -1148,6 +1205,25 @@ in { }; }; + chainmap = buildPythonPackage rec { + name = "chainmap-1.0.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/chainmap/${name}.tar.gz"; + sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; + }; + + # Requires tox + doCheck = false; + + meta = { + description = "Backport/clone of ChainMap"; + homepage = "https://bitbucket.org/jeunice/chainmap"; + license = licenses.psfl; + maintainers = with maintainers; [ abbradar ]; + }; + }; + arrow = buildPythonPackage rec { name = "arrow-${version}"; version = "0.7.0"; @@ -1468,6 +1544,10 @@ in { propagatedBuildInputs = with self; [ unidecode regex ]; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + meta = with stdenv.lib; { homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; @@ -1479,11 +1559,11 @@ in { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.11.35"; + version = "1.11.45"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "0k6y8cg311bqak5x9pilg80w6f76dcbzm6xcdrw6rjnk6v4xwy70"; + sha256 = "0sv9dw4zsra8fm7ddbnwhlh80w534z4h8llz2p8asssaaj5nq2ya"; }; # No tests included @@ -1525,10 +1605,10 @@ in { sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; }; + # Why does it propagate packages that are used for testing? propagatedBuildInputs = with self; [ - configobj prompt_toolkit awscli boto3 pygments mock pytest - pytestcov unittest2 tox + awscli prompt_toolkit boto3 configobj pygments ]; #Checks are failing due to missing TTY, which won't exist. @@ -1631,6 +1711,11 @@ in { url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip; sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py + ''; 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 @@ -1651,6 +1736,11 @@ in { url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip; sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py + ''; 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 @@ -1687,6 +1777,11 @@ in { url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip; sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py + ''; 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 @@ -1707,6 +1802,11 @@ in { url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip; sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py + ''; 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 @@ -2650,7 +2750,7 @@ in { sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; meta = { homepage = https://github.com/celery/billiard; @@ -2993,11 +3093,11 @@ in { boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.42.0"; + version = "2.45.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "04ywn8xszk57s87jnkv4j1hswc6ra7z811y9lawfvhvnfshrpx5d"; + sha256 = "18z5nacnbdpw3pmzc56didhy4sfik8riap204px24350g9xlgz7i"; }; checkPhase = '' @@ -3024,13 +3124,13 @@ in { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.4.2"; + version = "1.4.4"; src = pkgs.fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "19hzxqr7ba07b3zg2wsrz6ic3g7pq50rrcp4616flfgny5vw42j3"; + sha256 = "1zngj38a2dmc02p3ha9crzv9k682f0zgyyfx1bgg8hwwrnggikwl"; }; propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ @@ -3061,11 +3161,11 @@ in { }; botocore = buildPythonPackage rec { - version = "1.4.92"; # This version is required by awscli + version = "1.5.8"; # This version is required by awscli name = "botocore-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "08rpsfqd2g4iqvi1id8yhmyz2mc299dnr4aikkwjm24rih75p9aj"; + sha256 = "1qhrq2l9kvhi3gnrgwqhvy42aqbsk93j8mfr4ixqx18yqgbnylvz"; }; propagatedBuildInputs = @@ -3566,7 +3666,7 @@ in { sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; meta = { @@ -3594,11 +3694,11 @@ in { certifi = buildPythonPackage rec { name = "certifi-${version}"; - version = "2016.2.28"; + version = "2017.1.23"; src = pkgs.fetchurl { url = "mirror://pypi/c/certifi/${name}.tar.gz"; - sha256 = "5e8eccf95924658c97b990b50552addb64f55e1e3dfe4880456ac1f287dc79d0"; + sha256 = "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1"; }; meta = { @@ -3799,7 +3899,7 @@ in { homepage = https://github.com/click-contrib/click-log/; description = "Logging integration for Click"; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -3812,7 +3912,7 @@ in { sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; }; - checkInputs = with self; [ pytest ]; + checkInputs = with self; [ pytest_29 ]; propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures; checkPhase = '' @@ -3826,7 +3926,7 @@ in { homepage = https://github.com/click-contrib/click-threading/; description = "Multithreaded Click apps made easy"; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -4062,7 +4162,7 @@ in { # Backported version of the ConfigParser library of Python 3.3 configparser = if isPy3k then null else buildPythonPackage rec { name = "configparser-${version}"; - version = "3.3.0r2"; + version = "3.5.0"; # running install_egg_info # error: [Errno 9] Bad file descriptor: '<stdout>' @@ -4070,9 +4170,12 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/c/configparser/${name}.tar.gz"; - sha256 = "6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2"; + sha256 = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"; }; + # No tests available + doCheck = false; + meta = { maintainers = [ ]; platforms = platforms.all; @@ -4366,11 +4469,11 @@ in { cytoolz = buildPythonPackage rec { name = "cytoolz-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = pkgs.fetchurl{ url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz"; - sha256 = "2239890c8fe2da3eba82947c6a68cfa406e5a5045911c9ab3de8113462372629"; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; }; # Extension types @@ -4379,8 +4482,9 @@ in { buildInputs = with self; [ nose ]; propagatedBuildInputs = with self; [ toolz ]; + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 checkPhase = '' - nosetests -v $out/${python.sitePackages} + NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} ''; meta = { @@ -4672,7 +4776,7 @@ in { sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; }; - buildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest_29 ]; propagatedBuildInputs = with self; [ future numpy ]; doCheck = true; @@ -4944,7 +5048,7 @@ in { }; }; - pytest = self.pytest_29; + pytest = self.pytest_30; pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; @@ -4952,7 +5056,13 @@ in { pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {}; - pytest_30 = callPackage ../development/python-modules/pytest {}; + pytest_30 = callPackage ../development/python-modules/pytest{ + hypothesis = self.hypothesis.override { + # hypothesis requires pytest that causes dependency cycle + doCheck = false; + pytest = null; + }; + }; pytestcache = buildPythonPackage rec { name = "pytest-cache-1.0"; @@ -4978,9 +5088,7 @@ in { }; }; - pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { - pytest = self.pytest_30; - }; + pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; pytest-fixture-config = buildPythonPackage rec { name = "${pname}-${version}"; @@ -5102,24 +5210,7 @@ in { }; }; - pytestpep257 = buildPythonPackage rec { - name = "pytest-pep257-${version}"; - version = "0.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; - sha256 = "003vdkxpx37n0kjqpwgj3314hwk2jfz3nz58db7xh68bf8xy75lk"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ pep257 ]; - - meta = { - homepage = https://github.com/anderslime/pytest-pep257; - description = "py.test plugin for PEP257"; - license = licenses.mit; - }; - }; + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257.nix { }; pytest-raisesregexp = buildPythonPackage rec { name = "pytest-raisesregexp-${version}"; @@ -5569,7 +5660,7 @@ in { sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; }; - buildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest_29 ]; patchPhase = '' sed -i 's/==.*$//' requirements/test.txt ''; @@ -6165,40 +6256,7 @@ in { }; }; - docker = buildPythonPackage rec { - name = "docker-py-${version}"; - version = "1.10.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; - }; - - buildInputs = [ pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ - six - requests2 - websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds - ]; - - # Flake8 version conflict - doCheck = false; - - meta = { - description = "An API client for docker written in Python"; - homepage = https://github.com/docker/docker-py; - license = licenses.asl20; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker = callPackage ../development/python-modules/docker.nix {}; dockerpty = buildPythonPackage rec { name = "dockerpty-0.4.1"; @@ -6611,13 +6669,14 @@ in { }); entrypoints = buildPythonPackage rec { - name = "entrypoints"; - version = "0.2.1"; + pname = "entrypoints"; + version = "0.2.2"; + name = "${pname}-${version}"; format = "wheel"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/a5/2d/26548d66d58f7775cb332fcf3f864987c05f5e3f800b0b22b9919dacf653/entrypoints-0.2.1-py2.py3-none-any.whl"; - sha256 = "112n36dllmls19j5k6bwcnsm6y2789lxzkjl1n9yir7gkm0dmzzw"; + src = fetchPypi { + inherit pname version format; + sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; }; propagatedBuildInputs = with self; [ configparser ]; @@ -7379,7 +7438,7 @@ in { homepage = https://github.com/matlink/gplaycli; description = "Google Play Downloader via Command line"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -7679,15 +7738,16 @@ in { ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; - version = "0.4.0"; + version = "0.4.5-pre"; disabled = isPy26 || isPy27; - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipfsapi/${name}.tar.gz"; - sha256 = "0mqqsihannxzaqi8zcj9nca7fxwg1c85bp7xxic3xqa5zslcdcc3"; + src = pkgs.fetchFromGitHub { + owner = "ipfs"; + repo = "py-ipfs-api"; + rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f"; + sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126"; }; - buildInputs = with self; [ pkgs.pandoc ]; propagatedBuildInputs = with self; [ six requests2 ]; meta = { @@ -7819,7 +7879,7 @@ in { }; jug = buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.0"; name = "jug-${version}"; buildInputs = with self; [ nose numpy ]; propagatedBuildInputs = with self; [ @@ -7833,7 +7893,7 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "1262v63f1jljfd3rqvavzc2xfcray1m7vhqav3p6wlymgd342wrl"; + sha256 = "0s9m34k8w59k32sjcg74qqdz8r492sxhsdmlhca1z7jazdk56dzb"; }; meta = { @@ -8132,6 +8192,27 @@ in { }; }; + lmdb = buildPythonPackage rec { + pname = "lmdb"; + version = "0.92"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx"; + }; + + # Some sort of mysterious failure with lmdb.tool + doCheck = !isPy3k; + + meta = { + description = "Universal Python binding for the LMDB 'Lightning' Database"; + homepage = "https://github.com/dw/py-lmdb"; + license = licenses.openldap; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; @@ -8149,7 +8230,7 @@ in { # lpod library currently does not support Python 3.x disabled = isPy3k; - propagatedBuildInputs = with self; [ ]; + propagatedBuildInputs = with self; [ lxml docutils pillow ]; src = pkgs.fetchFromGitHub { owner = "lpod"; @@ -8322,7 +8403,7 @@ in { }; ndg-httpsclient = buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.2"; name = "ndg-httpsclient-${version}"; propagatedBuildInputs = with self; [ pyopenssl ]; @@ -8330,8 +8411,8 @@ in { src = pkgs.fetchFromGitHub { owner = "cedadev"; repo = "ndg_httpsclient"; - rev = "v${version}"; - sha256 = "1prv4j3wcy9kl5ndd5by543xp4cji9k35qncsl995w6sway34s1a"; + rev = version; + sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h"; }; # uses networking @@ -8341,43 +8422,11 @@ in { homepage = https://github.com/cedadev/ndg_httpsclient/; description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; license = licenses.bsd2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; - netcdf4 = buildPythonPackage rec { - name = "netCDF4-${version}"; - version = "1.2.4"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "0lakjix9dhc26f33f03c13ffwspqcrk5j3mnnjczwxbb23ppwwx6"; - }; - - propagatedBuildInputs = with self ; [ - numpy - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG="0"; - HDF5_DIR="${pkgs.hdf5}"; - NETCDF4_DIR="${pkgs.netcdf}"; - CURL_DIR="${pkgs.curl.dev}"; - JPEG_DIR="${pkgs.libjpeg.dev}"; - - meta = { - description = "Interface to netCDF library (versions 3 and 4)"; - homepage = https://pypi.python.org/pypi/netCDF4; - license = licenses.free; # Mix of license (all MIT* like) - }; - }; + netcdf4 = callPackage ../development/python-modules/netcdf4.nix { }; nxt-python = buildPythonPackage rec { version = "unstable-20160819"; @@ -8462,6 +8511,40 @@ in { }; }; + pants = buildPythonPackage rec { + pname = "pantsbuild.pants"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w"; + }; + + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py + ''; + + # Unnecessary, and causes some really weird behavior around .class files, which + # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. + dontStrip = true; + + 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 + setproctitle setuptools six thrift wheel twitter-common-dirutil + twitter-common-confluence twitter-common-collections + ]; + + meta = { + description = "A build system for software projects in a variety of languages"; + homepage = "http://www.pantsbuild.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + paperwork-backend = buildPythonPackage rec { name = "paperwork-backend-${version}"; version = "1.0.6"; @@ -8497,6 +8580,24 @@ in { }; }; + 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 ]; + }; + }; + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; version = "0.1.2"; @@ -8596,7 +8697,7 @@ in { description = "Tool for extracting information from PDF documents"; homepage = http://euske.github.io/pdfminer/index.html; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -8635,6 +8736,27 @@ in { }; }; + pex = buildPythonPackage rec { + name = "pex-${version}"; + version = "1.2.2"; + + src = self.fetchPypi { + pname = "pex"; + sha256 = "1nwrf03cd6jw24lxyaalj59fdm2infr9glabznkpaq65mjzwshl3"; + inherit version; + }; + + # A few more dependencies I don't want to handle right now... + doCheck = false; + + meta = { + description = "A library and tool for generating .pex (Python EXecutable) files"; + homepage = "https://github.com/pantsbuild/pex"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + pies = buildPythonPackage rec { name = "pies-2.6.5"; @@ -9330,9 +9452,12 @@ in { buildInputs = with self; [ nose sphinx numpydoc ]; - # Failing test on Python 3.x - postPatch = '''' + optionalString isPy3k '' + # Failing test on Python 3.x and Darwin + postPatch = '''' + optionalString (isPy3k || stdenv.isDarwin) '' sed -i -e '70,84d' joblib/test/test_format_stack.py + # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. + # Not sure why but it's nix-specific. Try removing for new joblib releases. + rm joblib/test/test_parallel.py ''; meta = { @@ -9631,6 +9756,23 @@ in { }; }; + scandir = self.buildPythonPackage rec { + name = "scandir-${version}"; + version = "1.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/scandir/${name}.tar.gz"; + sha256 = "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d"; + }; + + meta = with stdenv.lib; { + description = "A better directory iterator and faster os.walk()"; + homepage = "https://github.com/benhoyt/scandir"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + scfbuild = self.buildPythonPackage rec { name = "scfbuild-${version}"; version = "1.0.3"; @@ -10307,9 +10449,7 @@ in { }; }; - django_guardian = callPackage ../development/python-modules/django_guardian.nix { - pytest = self.pytest_30; - }; + django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; django_tagging = buildPythonPackage rec { name = "django-tagging-0.4.5"; @@ -11034,43 +11174,7 @@ in { }; }; - docker_compose = buildPythonPackage rec { - version = "1.9.0"; - name = "docker-compose-${version}"; - namePrefix = ""; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "0zz2jqpxz69q34bp97pbwxda1ik3m8zbhh15mxvhfsn0g566dywq"; - }; - - # lots of networking and other fails - doCheck = false; - buildInputs = with self; [ mock pytest nose ]; - propagatedBuildInputs = with self; [ - requests2 six pyyaml texttable docopt docker dockerpty websocket_client - enum34 jsonschema cached-property - ]; - - patchPhase = '' - sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py - ''; - - postInstall = '' - mkdir -p $out/share/bash-completion/completions/ - cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose - ''; - - meta = { - homepage = "https://docs.docker.com/compose/"; - description = "Multi-container orchestration for Docker"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker_compose = callPackage ../development/python-modules/docker_compose.nix {}; fdroidserver = buildPythonPackage rec { version = "2016-05-31"; @@ -11090,7 +11194,7 @@ in { meta = { homepage = https://f-droid.org; description = "Server and tools for F-Droid, the Free Software repository system for Android"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.agpl3; }; }; @@ -11205,11 +11309,11 @@ in { }; flask = buildPythonPackage { - name = "flask-0.11.1"; + name = "flask-0.12"; src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask/Flask-0.11.1.tar.gz"; - sha256 = "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl"; + url = "mirror://pypi/F/Flask/Flask-0.12.tar.gz"; + sha256 = "12yasybryp33rdchsqgckf15zj4pjfam7ly5spmn2sijpv6h7s4k"; }; propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; @@ -12549,41 +12653,7 @@ in { propagatedBuildInputs = with self; [ requests2 ]; }; - hypothesis = buildPythonPackage rec { - # http://hypothesis.readthedocs.org/en/latest/packaging.html - - # Hypothesis has optional dependencies on the following libraries - # pytz fake_factory django numpy pytest - # If you need these, you can just add them to your environment. - - name = "hypothesis-${version}"; - version = "3.5.2"; - - # Upstream prefers github tarballs - src = pkgs.fetchFromGitHub { - owner = "HypothesisWorks"; - repo = "hypothesis"; - rev = "${version}"; - sha256 = "030rf4gn4b0hylr90wazilwa3bc038fcqng0wibcx67mqaq035n4"; - }; - - buildInputs = with self; [ flake8 pytest flaky ]; - propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 ]); - - # Fails randomly in tests/cover/test_conjecture_engine.py::test_interleaving_engines. - doCheck = false; - - # https://github.com/DRMacIver/hypothesis/issues/300 - checkPhase = '' - ${python.interpreter} -m pytest tests/cover - ''; - - meta = { - description = "A Python library for property based testing"; - homepage = https://github.com/DRMacIver/hypothesis; - license = licenses.mpl20; - }; - }; + hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; colored = buildPythonPackage rec { name = "colored-${version}"; @@ -12904,12 +12974,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.1"; + version = "4.5.2"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; + sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; @@ -12934,17 +13004,17 @@ in { }; ipyparallel = buildPythonPackage rec { - version = "5.2.0"; + version = "6.0.0"; name = "ipyparallel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; - sha256 = "d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455"; + sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6"; }; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ optionals (!isPy3k) [ futures ]; # Requires access to cluster @@ -12960,12 +13030,12 @@ in { }; ipython = buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.1"; name = "ipython-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipython/${name}.tar.gz"; - sha256 = "7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961"; + sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -13028,6 +13098,9 @@ in { sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; }; + # Tests are not distributed + doCheck = false; + buildInputs = with self; [ nose pytest ]; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; @@ -13236,11 +13309,13 @@ in { }; jinja2 = buildPythonPackage rec { - name = "Jinja2-2.8"; + pname = "Jinja2"; + version = "2.9.5"; + name = "${pname}-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; - sha256 = "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw"; + sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; }; propagatedBuildInputs = with self; [ markupsafe ]; @@ -13352,12 +13427,12 @@ in { }; jupyter_core = buildPythonPackage rec { - version = "4.2.0"; + version = "4.2.1"; name = "jupyter_core-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c"; + sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3"; }; buildInputs = with self; [ pytest mock ]; @@ -13520,7 +13595,7 @@ in { sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; }; - buildInputs = with self; [ pytest_30 case pytz ]; + buildInputs = with self; [ pytest case pytz ]; propagatedBuildInputs = with self; [ amqp ]; @@ -13928,11 +14003,11 @@ in { lxml = buildPythonPackage ( rec { - name = "lxml-3.7.0"; + name = "lxml-3.7.2"; src = pkgs.fetchurl { url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9"; + sha256 = "02j1wf3sh2qmswcz3rh0xvsb8jm63ifaiz2bkng93hyvc1iignar"; }; buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; @@ -14211,8 +14286,7 @@ in { matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation CoreData; - inherit (pkgs.darwin) cf-private libobjc; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -14959,11 +15033,11 @@ in { multipledispatch = buildPythonPackage rec { name = "multipledispatch-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = pkgs.fetchurl { url = "mirror://pypi/m/multipledispatch/${name}.tar.gz"; - sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e"; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; }; meta = { @@ -15049,7 +15123,7 @@ in { meta = { homepage = https://github.com/aroig/mutag; license = licenses.gpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -15154,7 +15228,7 @@ in { meta = { description = "Python client library to the MediaWiki API"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.mit; homepage = https://github.com/mwclient/mwclient; }; @@ -15419,17 +15493,17 @@ in { }; nbconvert = buildPythonPackage rec { - version = "4.2.0"; + version = "5.1.1"; name = "nbconvert-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbconvert/${name}.tar.gz"; - sha256 = "1ik3k1s8dnqcc6hcrzi1wwy6f5kxfz8rnyahvpy984kl49snv52m"; + sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d"; }; buildInputs = with self; [nose ipykernel ]; - propagatedBuildInputs = with self; [ entrypoints mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client]; + propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client]; checkPhase = '' nosetests -v @@ -15447,16 +15521,19 @@ in { }; nbformat = buildPythonPackage rec { - version = "4.0.1"; + version = "4.2.0"; name = "nbformat-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbformat/${name}.tar.gz"; - sha256 = "5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5"; + sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = with self; [ pytest pkgs.glibcLocales ]; + propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core]; - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core]; + # Failing tests and permission issues + doCheck = false; meta = { description = "The Jupyter Notebook format"; @@ -15502,13 +15579,13 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.2.1"; + version = "1.2.4.post1"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9"; + sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk"; }; patchPhase = '' @@ -15772,11 +15849,11 @@ in { nose-exclude = buildPythonPackage rec { name = "nose-exclude-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/n/nose-exclude/${name}.tar.gz"; - sha256 = "44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da"; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; }; propagatedBuildInputs = with self; [ nose ]; @@ -15892,12 +15969,12 @@ in { }; notebook = buildPythonPackage rec { - version = "4.2.3"; + version = "4.3.2"; name = "notebook-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851"; + sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9"; }; LC_ALL = "en_US.UTF-8"; @@ -16032,12 +16109,12 @@ in { numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.6.1"; + version = "2.6.2"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; + sha256 = "6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705"; }; propagatedBuildInputs = with self; [ numpy ]; @@ -16629,22 +16706,23 @@ in { }; }); - osc = buildPythonPackage (rec { - name = "osc-0.133+git"; + osc = buildPythonPackage { + name = "osc-0.156.0-16-g9e6d1a5"; disabled = isPy3k; - - src = pkgs.fetchgit { - url = https://github.com/openSUSE/osc; - rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce"; - sha256 = "0bf0yc4y1q87k7hq40xnr687lyw3ma93b3zprjlgn9pr8s1cn9xw"; + src = pkgs.fetchFromGitHub { + owner = "openSUSE"; + repo = "osc"; + rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9"; + sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z"; }; - - doCheck = false; + propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; - - propagatedBuildInputs = with self; [ self.m2crypto ]; - - }); + meta = { + description = "opensuse-commander with svn like handling"; + maintainers = [ maintainers.peti ]; + license = licenses.gpl2; + }; + }; oslosphinx = buildPythonPackage rec { name = "oslosphinx-3.3.1"; @@ -16986,6 +17064,7 @@ in { meta = with stdenv.lib; { description = "Python bindings to the OpenStack Cinder API"; homepage = "http://www.openstack.org/"; + broken = true; }; }; @@ -17265,6 +17344,8 @@ in { url = "mirror://pypi/r/ryu/${name}.tar.gz"; sha256 = "1fhriqi7qnvvx9mbvlfm94i5drh920lg204zy3v0qjz43sinkih6"; }; + + meta.broken = true; }; WSME = buildPythonPackage rec { @@ -17864,11 +17945,11 @@ in { requests-mock = buildPythonPackage rec { name = "requests-mock-${version}"; - version = "0.6.0"; + version = "1.3.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests-mock/${name}.tar.gz"; - sha256 = "0gmd88c224y53b1ai8cfsrcxm9kw3gdqzysclmnaqspg7zjhxwd1"; + sha256 = "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx"; }; patchPhase = '' @@ -17956,10 +18037,10 @@ in { bottleneck = buildPythonPackage rec { name = "Bottleneck-${version}"; - version = "1.0.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz"; - sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd"; + sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; }; buildInputs = with self; [ nose ]; @@ -18025,15 +18106,16 @@ in { }; paramiko = buildPythonPackage rec { - name = "paramiko-${version}"; - version = "2.0.2"; + pname = "paramiko"; + version = "2.1.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/paramiko/${name}.tar.gz"; - sha256 = "1p21s7psqj18k9a97nq26yas058i5ivzk7pi7y98l1rbl87zj6s1"; + src = fetchPypi { + inherit pname version; + sha256 = "0xdmamqgx2ymhdm46q8flpj4fncj4wv2dqxzz0bc2dh7mnkss7fm"; }; - propagatedBuildInputs = with self; [ cryptography cryptography_vectors ]; + propagatedBuildInputs = with self; [ cryptography pyasn1 ]; # https://github.com/paramiko/paramiko/issues/449 doCheck = !(isPyPy || isPy33); @@ -18416,28 +18498,7 @@ in { }; }; - pep257 = buildPythonPackage rec { - name = "pep257-${version}"; - version = "0.3.2"; - - src = pkgs.fetchurl { - url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz"; - sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn"; - }; - LC_ALL="en_US.UTF-8"; - buildInputs = with self; [ pkgs.glibcLocales pytest ]; - - checkPhase = '' - py.test - ''; - - meta = { - homepage = https://github.com/GreenSteam/pep257/; - description = "Python docstring style checker"; - longDescription = "Static analysis tool for checking compliance with Python PEP 257."; - lecense = licenses.mit; - }; - }; + pep257 = callPackage ../development/python-modules/pep257.nix { }; percol = buildPythonPackage rec { name = "percol-${version}"; @@ -18477,17 +18538,19 @@ in { pexpect = buildPythonPackage rec { - version = "3.3"; + version = "4.2.1"; name = "pexpect-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pexpect/${name}.tar.gz"; - sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba"; + sha256 = "3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"; }; - # Wants to run python in a subprocess + # Wants to run pythonin a subprocess doCheck = false; + propagatedBuildInputs = with self; [ ptyprocess ]; + meta = { homepage = http://www.noah.org/wiki/Pexpect; description = "Automate interactive console applications such as ssh, ftp, etc"; @@ -19544,7 +19607,7 @@ in { description = "Module for reading vCard and vCalendar files"; homepage = http://eventable.github.io/vobject/; license = licenses.asl20; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -19565,7 +19628,7 @@ in { description = "Command-line interface carddav client"; homepage = http://lostpackets.de/pycarddav; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20016,6 +20079,9 @@ in { path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; in '' sed -i "${path_hack_script}" enchant/_enchant.py + + # They hardcode a bad path for Darwin in their library search code + substituteInPlace enchant/_enchant.py --replace '/opt/local/lib/' "" ''; # dictionaries needed for tests @@ -20406,7 +20472,7 @@ in { description = "Media Meta Data retrieval framework"; homepage = http://sourceforge.net/projects/mmpython/; license = licenses.gpl2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20449,7 +20515,7 @@ in { description = "Generic application framework, providing the foundation for other modules"; homepage = https://github.com/freevo/kaa-base; license = licenses.lgpl21; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20496,7 +20562,7 @@ in { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; homepage = https://github.com/freevo/kaa-metadata; license = licenses.gpl2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20703,7 +20769,7 @@ in { for test in $disabledTests; do file="''${test%%:*}" fun="''${test#*:}" - echo "$fun = unittest.expectedFailure($fun)" >> "tests/tests_$file.py" + echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py" done ''; @@ -21001,11 +21067,11 @@ in { pysocks = buildPythonPackage rec { name = "pysocks-${version}"; - version = "1.5.7"; + version = "1.6.6"; src = pkgs.fetchurl { url = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz"; - sha256 = "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775"; + sha256 = "0h9zwr8z9j6l313ns335irjrkk6qnk4qzvwmjqygrp7mbwi9lh82"; }; doCheck = false; @@ -22045,11 +22111,11 @@ in { requests2 = buildPythonPackage rec { name = "requests-${version}"; - version = "2.11.1"; + version = "2.13.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133"; + sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; }; nativeBuildInputs = [ self.pytest ]; @@ -23037,12 +23103,12 @@ in { }; s3transfer = buildPythonPackage rec { - version = "0.1.9"; + version = "0.1.10"; name = "s3transfer-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/s/s3transfer/${name}.tar.gz"; - sha256 = "0m67nhdnp2pd11j8h4bgz63zq0mvn2f205vrxmr3my8m45kpvb8p"; + sha256 = "1h8g9bknvxflxkpbnxyfxmk8pvgykbbk9ljdvhqh6z4vjc2926ms"; }; foo = 1; @@ -23389,7 +23455,7 @@ in { url = "mirror://pypi/s/${pname}/${name}.tar.gz"; sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = with self; [ pytest_29 virtualenv pytestrunner pytest-virtualenv ]; propagatedBuildInputs = with self; [ twisted pathlib2 ]; postPatch = '' sed -i '12,$d' tests/test_main.py @@ -23558,7 +23624,7 @@ in { description = "A Parser Generator for Python"; homepage = https://pypi.python.org/pypi/SimpleParse; platforms = platforms.all; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -24502,16 +24568,16 @@ in { sphinx = buildPythonPackage (rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.5.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "8e6a77a20b2df950de322fc32f3b508697d9d654fe984e3cc88f446a5b4c17c5"; + version = "1.5.2"; + src = fetchPypi { + inherit pname version; + sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34; + buildInputs = with self; [ pytest simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34; # Disable two tests that require network access. checkPhase = '' - NOSE_EXCLUDE=test_defaults,test_anchors_ignored make test + cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' ''; propagatedBuildInputs = with self; [ docutils @@ -24526,6 +24592,13 @@ in { imagesize requests2 ]; + + # https://github.com/NixOS/nixpkgs/issues/22501 + # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. + postPatch = '' + substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" + ''; + meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = http://sphinx.pocoo.org/; @@ -25030,7 +25103,7 @@ in { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; homepage = http://www.subdownloader.net; license = licenses.gpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -25168,7 +25241,7 @@ in { meta = { description = " GTK3 & python based GUI for Syncthing "; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = pkgs.syncthing.meta.platforms; homepage = "https://github.com/syncthing/syncthing-gtk"; license = licenses.gpl2; @@ -25200,12 +25273,12 @@ in { }; tabulate = buildPythonPackage rec { - version = "0.7.5"; + version = "0.7.7"; name = "tabulate-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/tabulate/${name}.tar.gz"; - sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e"; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; }; buildInputs = with self; [ nose ]; @@ -25438,6 +25511,35 @@ in { }; }; + testpath = buildPythonPackage rec { + pname = "testpath"; + version = "0.3"; + name = "${pname}-${version}"; + + #format = "flit"; + #src = pkgs.fetchFromGitHub { + # owner = "jupyter"; + # repo = pname; + # rev = "${version}"; + # sha256 = "1ghzmkrsrk9xrj42pjsq5gl7v3g2v0ji0xy0xzzxp5aizd3wrvl9"; + #}; + #doCheck = true; + #checkPhase = '' + # ${python.interpreter} -m unittest discover + #''; + format = "wheel"; + src = fetchPypi { + inherit pname version format; + sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; + }; + + meta = { + description = "Test utilities for code working with files and commands"; + license = licenses.mit; + homepage = https://github.com/jupyter/testpath; + }; + }; + testrepository = buildPythonPackage rec { name = "testrepository-${version}"; version = "0.0.20"; @@ -25960,6 +26062,122 @@ in { }; }; + twitter-common-collections = buildPythonPackage rec { + pname = "twitter.common.collections"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5"; + }; + + propagatedBuildInputs = with self; [ twitter-common-lang ]; + + meta = { + description = "Twitter's common collections"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-confluence = buildPythonPackage rec { + pname = "twitter.common.confluence"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26"; + }; + + propagatedBuildInputs = with self; [ twitter-common-log ]; + + meta = { + description = "Twitter's API to the confluence wiki"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-dirutil = buildPythonPackage rec { + pname = "twitter.common.dirutil"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha"; + }; + + propagatedBuildInputs = with self; [ twitter-common-lang ]; + + meta = { + description = "Utilities for manipulating and finding files and directories"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-lang = buildPythonPackage rec { + pname = "twitter.common.lang"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan"; + }; + + meta = { + description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-log = buildPythonPackage rec { + pname = "twitter.common.log"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v"; + }; + + propagatedBuildInputs = with self; [ twitter-common-options twitter-common-dirutil ]; + + meta = { + description = "Twitter's common logging library"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-options = buildPythonPackage rec { + pname = "twitter.common.options"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd"; + }; + + meta = { + description = "Twitter's optparse wrapper"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + twine = buildPythonPackage rec { name = "twine-${version}"; version = "1.8.1"; @@ -26959,11 +27177,11 @@ EOF xarray = buildPythonPackage rec { name = "xarray-${version}"; - version = "0.8.2"; + version = "0.9.1"; src = pkgs.fetchurl { url = "mirror://pypi/x/xarray/${name}.tar.gz"; - sha256 = "4da06e38baea65c51347ba0770db416ebf003dbad5637215d2b25b191f2be1fb"; + sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525"; }; buildInputs = with self; [ pytest ]; @@ -27840,7 +28058,7 @@ EOF homepage = https://github.com/scs3jb/screenkey; description = "A screencast tool to show your keys"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }; @@ -27901,6 +28119,10 @@ EOF buildInputs = with self; [ pytest pkgs.glibcLocales ]; }; + libasyncns = callPackage ../development/python-modules/libasyncns.nix { + inherit (pkgs) libasyncns pkgconfig; + }; + pybrowserid = buildPythonPackage rec { name = "PyBrowserID-${version}"; version = "0.9.2"; @@ -28710,20 +28932,27 @@ EOF searx = buildPythonPackage rec { name = "searx-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = pkgs.fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2"; + sha256 = "1m6q7yd45lfk19yp30x1jmisff6npa1y348wqc9ixa3ywvb28ky8"; }; - patches = [ ../development/python-modules/searx.patch ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'certifi==2016.9.26' 'certifi' \ + --replace 'pyyaml==3.11' 'pyyaml' \ + --replace 'lxml==3.7.1' 'lxml' \ + --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'requests[socks]==2.12.4' 'requests[socks]' + ''; propagatedBuildInputs = with self; [ - pyyaml lxml_3_5 grequests flaskbabel flask requests2 - gevent speaklater Babel pytz dateutil pygments_2_0 + pyyaml lxml grequests flaskbabel flask requests2 + gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; @@ -29358,7 +29587,7 @@ EOF homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = licenses.agpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -29908,16 +30137,15 @@ EOF }; jenkins-job-builder = buildPythonPackage rec { - name = "jenkins-job-builder-1.4.0"; + name = "jenkins-job-builder-1.6.1"; disabled = ! (isPy26 || isPy27); src = pkgs.fetchurl { url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz"; - sha256 = "10zipq3dyyfhwvrcyk70zky07b0fssiahwig2h8daw977aszsfqb"; + sha256 = "1v3xknfzgsp35nn3ma4imz233v569v3x75mx2yxlv1xf32nn7yk4"; }; patchPhase = '' - sed -i '/ordereddict/d' requirements.txt export HOME=$TMPDIR ''; @@ -29969,7 +30197,7 @@ EOF poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.10"; + version = "0.11"; disabled = pythonOlder "3.4"; @@ -29977,13 +30205,12 @@ EOF propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz"; - sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn"; + url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz"; + sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0"; }; patches = [ ../development/python-modules/poezio/fix_gnupg_import.patch - ../development/python-modules/poezio/fix_plugins_imports.patch ]; checkPhase = '' @@ -30802,18 +31029,16 @@ EOF }; }; pandocfilters = buildPythonPackage rec{ - version = "1.3.0"; + version = "1.4.1"; pname = "pandocfilters"; name = pname + "-${version}"; - src = pkgs.fetchFromGitHub { - owner = "jgm"; - repo = pname; - rev = version; - sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz"; + src = fetchPypi{ + inherit pname version; + sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd"; }; - - propagatedBuildInputs = with self; [ ]; + # No tests available + doCheck = false; meta = { description = "A python module for writing pandoc filters, with a collection of examples"; @@ -31615,7 +31840,7 @@ EOF url = "mirror://pypi/a/${pname}/${name}.tar.gz"; sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51"; }; - buildInputs = with self; [ unittest2 mock pytest trollius ]; + buildInputs = with self; [ unittest2 mock pytest_29 trollius ]; propagatedBuildInputs = with self; [ six twisted txaio ]; checkPhase = '' py.test $out @@ -31849,7 +32074,7 @@ EOF sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; }; - buildInputs = with self; [ case pytest_30 ]; + buildInputs = with self; [ case pytest ]; meta = { homepage = https://github.com/celery/vine; @@ -31902,6 +32127,10 @@ EOF }; }; + incremental = callPackage ../development/python-modules/incremental { }; + + treq = callPackage ../development/python-modules/treq { }; + }); in fix' (extends overrides packages) |