diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
commit | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (patch) | |
tree | 4a4ee79a6e0694d3c7ad6fbeff33343d83458e6c /pkgs/development/python-modules | |
parent | a2538606e3115e16db2e5075ecf37b886ad64ede (diff) | |
parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/python-modules')
121 files changed, 685 insertions, 330 deletions
diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index ed89c26943f8d..b0c81a62e337b 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -1,33 +1,29 @@ -{ pkgs -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi +, cryptography , invoke +, mock , paramiko -, cryptography , pytest -, mock , pytest-relaxed }: buildPythonPackage rec { pname = "fabric"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "93684ceaac92e0b78faae551297e29c48370cede12ff0f853cdebf67d4b87068"; + sha256 = "19nzdibjfndzcwvby20p59igqwyzw7skrb45v2mxqsjma5yjv114"; }; propagatedBuildInputs = [ invoke paramiko cryptography ]; checkInputs = [ pytest mock pytest-relaxed ]; - # ignore subprocess main errors (1) due to hardcoded /bin/bash checkPhase = '' - rm tests/main.py pytest tests ''; - meta = with pkgs.lib; { + meta = with lib; { description = "Pythonic remote execution"; homepage = https://www.fabfile.org/; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 18c42dbc126b0..b1b71b3957247 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.5"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "1qjwqshcrfsa2a0j9bk0w01y857idzic1bj202p9cpar3xsjjw69"; + sha256 = "126gpx6zj7fpx87v1qgicpfdahmmkqqmd2a8abllq0jlckrmjsyh"; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 9e053c718c864..77d7cf653d196 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -1,14 +1,17 @@ -{ lib, isPy3k, fetchPypi, buildPythonPackage +{ lib, isPy3k, fetchFromGitHub, buildPythonPackage , atpublic }: buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.2"; + version = "1.2.1"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1xdfk741pjmz1cm8dsi4n5vq4517i175rm94696m3f7kcgk7xsmp"; + # Release not published to Pypi + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = version; + sha256 = "14c30dm6jzxiblnsah53fdv68vqhxwvb9x0aq9bc4vcdas747vr7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index e21445ab3ec2d..fab3c0df58c5c 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchFromGitHub , buildPythonPackage , pycrypto , paramiko @@ -18,11 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.8.2"; + version = "2.8.4"; - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730"; + src = fetchFromGitHub { + owner = "ansible"; + repo = "ansible"; + rev = "v${version}"; + sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki"; }; prePatch = '' diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index 8fe664f42310e..d2a72461b1779 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "authres"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0bxclx021zn4hhrpaw5fl61bhnf17yqjd0pvwxqfqwdkxdjpx37b"; + sha256 = "1dr5zpqnb54h4f5ax8334l1dcp8j9083d7v4vdi1xqkwmnavklck"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/azure-cli-core/default.nix b/pkgs/development/python-modules/azure-cli-core/default.nix index 3455053ff21a9..f535a24317855 100644 --- a/pkgs/development/python-modules/azure-cli-core/default.nix +++ b/pkgs/development/python-modules/azure-cli-core/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "azure-cli-core"; - version = "2.0.69"; + version = "2.0.71"; src = fetchPypi { inherit pname version; - sha256 = "797c4fab2285aa2ac316daf692c1e8f6b14186c059805e8a57332b4d83d7bb23"; + sha256 = "01pqdh16l2c9a6b1az9galmm1szvhg7fyf9shq872wanw1xx88dj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index ad730774c5e59..6384df020e04f 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.7.0"; + version = "4.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04z9f0nd2nh5miw81qahqrrz998l4yd328qcyx7bxg42a5f5v5jp"; + sha256 = "0h2lnigmh2arq0ppwjk8h9rqxplj6s7h7qxwyv7wirk0ydx6cfd9"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 0f4c6b101e045..b8b39292e5f62 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "3.3.0"; + version = "4.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kffay8hr8h3hf78wb1kisvffpwxsxy6lixbgh9dbv0p781sgyh6"; + sha256 = "1kxd30s2axn3g4qx3v7q3d5l744a29xlfk3q06ra0rqm1p6prvgv"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 823b9ab8c6a45..a86acbb23ac2b 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,16 +14,16 @@ }: buildPythonPackage rec { - version = "19.1.1"; + version = "19.7.3"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "81e8a5ef8240c6a2205463fa7bc643b8033125237927f5492dab0b5d1aadb35a"; + sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw"; }; - buildInputs = [ cython cmake ]; + nativeBuildInputs = [ cmake cython ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ]; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 6a5e6f82b7c38..5b5655553144b 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.55.0"; + version = "3.56.0"; src = fetchPypi { inherit pname version; - sha256 = "0l3i0ayzykrsraqf87z4h39qm3kxyfwrm09n81gnkvsn2126izsd"; + sha256 = "1d1xv7b4s68yfa3snnvcjldj0q7v1izpyvqkv2c1k0w73hl657b5"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 64510ee5b6409..807dafab4369a 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.6.4"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc"; + sha256 = "1f24hsclg1wz2i8aiam91l06qqy0plxhwl615l4qkg35mbw4ry7h"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 7459fc6f981b5..c19fc280c7f65 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -3,7 +3,7 @@ sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, - glibcLocales }: + git, glibcLocales }: let withPlugins = plugins: buildPythonPackage { @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0qzr6my8zvaj0a1jwyaf254rdgm1xcyq8zp4b6fa5aqigfld4dfg"; + sha256 = "141ad2g1j5y0n5cdnd18m55ss0gqjlz5ky85rb6qfn73dgw42vmz"; }; propagatedBuildInputs = [ @@ -37,7 +37,6 @@ let twisted jinja2 zope_interface - future sqlalchemy sqlalchemy_migrate dateutil @@ -65,6 +64,7 @@ let buildbot-worker buildbot-pkg parameterized + git glibcLocales ]; @@ -95,7 +95,7 @@ let meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 8de1572b48c09..dababe48e996a 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0bpqiih15b5kzx1r542m8j7ydbnmgzhdnkaxv0z7gjv21k78m5i5"; + sha256 = "0na336jwibgbix8fr4jki1gqys44kkm0a8q32llcr2z08igs4mvy"; }; postPatch = '' @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index e03524ea5adaa..e31085a249880 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -1,23 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg }: +{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg, mock }: { www = buildPythonPackage rec { - pname = "buildbot_www"; + pname = "buildbot-www"; inherit (buildbot-pkg) version; - # NOTE: wheel is used due to buildbot circular dependency - format = "wheel"; - src = fetchPypi { - inherit pname version format; - python = "py3"; - sha256 = "1ii01py78wkda9x4lqm0bxqmb4dhvbdmmz7sncm1lw7bhmhqh84w"; + inherit pname version; + sha256 = "0g3m5z8yska245r1x9n85b4br8b63i4zca2qn3qspf62b1wzmxmd"; }; + buildInputs = [ buildbot buildbot-pkg mock ]; + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot UI"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -28,16 +26,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1y523hadw3398jwfpmi2f4g0s6dp9y191qzycrsbvbj147dp0qra"; + sha256 = "0p7az9mb09c4bl0j37w28wflzygq9vy8rjbbnhlfbs6py6mjdagr"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Console View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -48,16 +46,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1prfr03igcmagydvxqhrh6k6wz16vk6fwgrm143jh3xmml6f16ll"; + sha256 = "0ba0a7q7ii7sipvifxs9ldkcs4b975skndarmirbphc797993hj1"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Waterfall View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -68,16 +66,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1xkqiwxjppyns2s0239zzvbnr8b7vdakypj95mca89mmnyniflxj"; + sha256 = "0dvchhjzmfbbrxqm8dlmwck22z99pgnflxk3cyn0wbb1qskhd9cv"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Grid View Plugin"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ nand0p lopsided98 ]; license = licenses.gpl2; }; }; @@ -88,16 +86,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1jhvq61x0bzh03nd2ac11swdjn0ndnx3ac7x9v3m3v0pgr08rc28"; + sha256 = "0w9p3y89rqsmqiacwj2avir42r0xjr2yri14v3ay6yar5391r8wa"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot WSGI dashboards Plugin"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 0ca2570496a0d..8cfc56678c02c 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lvgqcayd4f32895g3cwrbnjw6p94nrggbq7wfz5mwbhpgg6hv52"; + sha256 = "04dk1jg0yq0rcm7j7pn7l1pqqjhiyvwppnhc1b7106sx2cdj2yb2"; }; propagatedBuildInputs = [ twisted future ]; @@ -22,7 +22,7 @@ buildPythonPackage (rec { meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Worker Daemon"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index aa3aa8b9c02bd..653296a927e84 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi -, tzlocal, requests, vobject, lxml }: +, tzlocal, requests, vobject, lxml, nose }: buildPythonPackage rec { pname = "caldav"; version = "0.6.1"; - propagatedBuildInputs = [ tzlocal requests vobject lxml ]; + propagatedBuildInputs = [ tzlocal requests vobject lxml nose ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 755f921174691..3b49289c2e48a 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Backend data caching and persistence daemon for Graphite"; - maintainers = with maintainers; [ rickynils offline basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 96602c624a470..8c55c3ac8bbb6 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast , more-itertools, six, setuptools_scm, setuptools-scm-git-archive , pytest, pytestcov, portend, pytest-testmon, pytest-mock , backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket , backports_functools_lru_cache }: +let inherit (stdenv) lib; in + buildPythonPackage rec { pname = "cheroot"; - version = "6.5.5"; + version = "6.5.6"; src = fetchPypi { inherit pname version; - sha256 = "f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601"; + sha256 = "b824f9961eb447809badeb051820a05770354e2f9ae5c355eecc21f22633c217"; }; + patches = [ ./tests.patch ]; + nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; @@ -20,14 +24,17 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; # Disable doctest plugin because times out + # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out # Deselect test_http_over_https_error on darwin because builtin cert fails + # Disable warnings-as-errors because of deprecation warnings from socks on python 3.7 checkPhase = '' - substituteInPlace pytest.ini --replace "--doctest-modules" "" - pytest ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" + ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} + pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance, pure-Python HTTP"; homepage = https://github.com/cherrypy/cheroot; license = licenses.mit; diff --git a/pkgs/development/python-modules/cheroot/tests.patch b/pkgs/development/python-modules/cheroot/tests.patch new file mode 100644 index 0000000000000..3de48a5a4684d --- /dev/null +++ b/pkgs/development/python-modules/cheroot/tests.patch @@ -0,0 +1,45 @@ +diff --git a/cheroot/test/test_ssl.py b/cheroot/test/test_ssl.py +index fe8a0a0..92a77c1 100644 +--- a/cheroot/test/test_ssl.py ++++ b/cheroot/test/test_ssl.py +@@ -316,11 +316,9 @@ def test_tls_client_auth( + expected_ssl_errors = ( + requests.exceptions.SSLError, + OpenSSL.SSL.Error, +- ) if PY34 else ( +- requests.exceptions.SSLError, ++ requests.exceptions.ConnectionError, + ) +- if IS_WINDOWS: +- expected_ssl_errors += requests.exceptions.ConnectionError, ++ + with pytest.raises(expected_ssl_errors) as ssl_err: + make_https_request() + +@@ -335,7 +333,7 @@ def test_tls_client_auth( + except AttributeError: + if PY34: + pytest.xfail('OpenSSL behaves wierdly under Python 3.4') +- elif six.PY3 and IS_WINDOWS: ++ elif six.PY3: + err_text = str(ssl_err.value) + else: + raise +@@ -348,8 +346,7 @@ def test_tls_client_auth( + if IS_MACOS and IS_PYPY and adapter_type == 'pyopenssl': + expected_substrings = ('tlsv1 alert unknown ca', ) + if ( +- IS_WINDOWS +- and tls_verify_mode in ( ++ tls_verify_mode in ( + ssl.CERT_REQUIRED, + ssl.CERT_OPTIONAL, + ) +@@ -361,6 +358,7 @@ def test_tls_client_auth( + "SysCallError(10054, 'WSAECONNRESET')", + "('Connection aborted.', " + 'OSError("(10054, \'WSAECONNRESET\')"))', ++ 'OSError("(104, \'ECONNRESET\')"))', + ) + assert any(e in err_text for e in expected_substrings) + diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index a7ae70a437951..3aece4020e6c3 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { homepage = http://liw.fi/cliapp/; description = "Python framework for Unix command line programs"; license = licenses.gpl2; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a71d048b47bba..7d78abd075deb 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.15"; + version = "0.9.16"; src = fetchPypi { inherit pname version; - sha256 = "0k3y3czpabw173vhqg523l2r804jj08986wlz6vyh224zr0ngggw"; + sha256 = "0ggvh38mc1kkrlqdicjz5a16j5v6f6z0nwmcvv8i3y5gaffkfy2b"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix new file mode 100644 index 0000000000000..01f5bb8a7e537 --- /dev/null +++ b/pkgs/development/python-modules/crc16/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "crc16"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15nkx0pa4lskwin84flpk8fsw3jqg6wic6v3s83syjqg76h6my61"; + }; + + meta = with stdenv.lib; { + homepage = "https://code.google.com/archive/p/pycrc16/"; + description = "Python library for calculating CRC16"; + license = licenses.lgpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index aaaad292df046..d0f3a7dc76236 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "6.0.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "168xi92pfk80n2k47qc5zim7jai3kcmj3j157fynz9c8dfw4sbn4"; + sha256 = "0d6liaavgqks772rqam53qha3yk6dfw24i0pj3izxvvawzhlp10z"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 5708bf12d6bcc..77814ec1191cf 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.1.3"; + version = "7.2.2"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "4f26b7418e2796112f8b36338a2f9a7c07dd08df53d857e3478bb53f61dd52e4"; + sha256 = "1kp6fgyln0jkdbjm20h6rhybsmvqjj847frhsndyfvkf38m32ss0"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 600fe8887514c..e01433d90c5c5 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.6"; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "68071e5ae7cd7e9da6c7dffd750922be4825c7c3a6780d29314076009cc39c35"; + sha256 = "1vcjy6flqbzgjh4zhcs0sl83b946wxrlsx5miliz0ik1d9kjyff0"; }; propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index da082643e0fd2..4a892ddb7058f 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.28.1"; + version = "2.3.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "12n487qn66jkgq4nd3vgyc9hfqw4i7zwr4dyybsqm4xmgs5kzn1v"; + sha256 = "15lb6fz3739nkyxi1igzm5p2lk40digkc9fkzjqx1jpymfac9dwl"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix new file mode 100644 index 0000000000000..91cea9b00598e --- /dev/null +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +, django-allauth, mailmanclient, django, mock +}: + +buildPythonPackage rec { + pname = "django-mailman3"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v6c1jhcc212wc2xa314irfcchl05r7nysrcy63dcaan958kmnnx"; + }; + + propagatedBuildInputs = [ + django-gravatar2 django_compressor django-allauth mailmanclient + ]; + checkInputs = [ django mock ]; + + checkPhase = '' + cd $NIX_BUILD_TOP/$sourceRoot + PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test + ''; + + meta = with stdenv.lib; { + description = "Django library for Mailman UIs"; + homepage = https://gitlab.com/mailman/django-mailman3; + license = licenses.gpl3; + maintainers = with maintainers; [ globin peti ]; + }; +} diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 71ec20faed8bf..af3404b2f880b 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "0.2.4"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1bwpgmkh32d7a5dgppin9m0mnh8a33ccl5ksnpw5vjp4lal3xq73"; + sha256 = "087mspmx74qbcknpbksl66rsyin0dc5aglhjmmpk999pl2wvdfk0"; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 479e66289e644..4efd2002b1fd5 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -2,18 +2,21 @@ , buildPythonPackage , fetchPypi , pytz +, pythonOlder , six }: buildPythonPackage rec { pname = "django-modelcluster"; - version = "4.4"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "02mrs7aapabapfh7h7n71s8r7zxkmad3yk4rdyfwcf0x36326rsr"; + sha256 = "0zcn1b0lp9dg6xvz8p8v1hrrgqj71izqalqz2dp1nz5rbj3s34x2"; }; + disabled = pythonOlder "3.5"; + doCheck = false; propagatedBuildInputs = [ pytz six ]; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 6bb2b1d43f15e..13ba5ef7964e3 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "django-silk"; - version = "3.0.2"; + version = "3.0.3"; # pypi tarball doesn't include test project src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = version; - sha256 = "1fbaafc2gx01gscdalp6hj6bz4b0cmq59lgmvsydw7jkds4mps7c"; + sha256 = "0j1r88zv7fvmlnrzr2h65czzdcpvl7n847ra1pfc52bfa4lf8b9j"; }; # "test_time_taken" tests aren't suitable for reproducible execution, but django's # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index c200b6959b647..d9b3bb93264e5 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }: +{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; @@ -10,9 +10,15 @@ buildPythonPackage { ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ''; - setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ]; + setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS"; patches = [ ./build-cores.patch ]; - checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "more-itertools<6.0.0" "more-itertools" \ + --replace "pytest==3.8" "pytest" + ''; + + checkInputs = [ pytest more-itertools ]; } diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 804267268d78c..deeb8ce064209 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -11,6 +11,7 @@ , fetchurl , dbus , xvfb_run +, wrapGAppsHook # , fetchPypi }: @@ -32,8 +33,9 @@ buildPythonPackage rec { ./nix-support.patch ]; - nativeBuildInputs = [ gobject-introspection dbus xvfb_run ]; # for setup hooks + nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; + strictDeps = false; # issue 56943 checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 94c67afe164d5..7288dee776319 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.3.5"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lda2a4nxxh9wp727vhn31rl5v7y9fxkscdjawg7gzj50xf76xj0"; + sha256 = "1775cz6lipb43hmjll77m2pxh72pikng74lpg30v9n1b66s78959"; }; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix new file mode 100644 index 0000000000000..0a2e8dff1b732 --- /dev/null +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -0,0 +1,14 @@ +{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }: + +buildPythonPackage rec { + pname = "flufl.bounce"; + version = "3.0"; + + buildInputs = [ nose2 ]; + propagatedBuildInputs = [ atpublic zope_interface ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2"; + }; +} diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix new file mode 100644 index 0000000000000..6e8d77bf4f814 --- /dev/null +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, atpublic }: + +buildPythonPackage rec { + pname = "flufl.i18n"; + version = "2.0.2"; + + propagatedBuildInputs = [ atpublic ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1csgds59nx0ann9v2alqr69lakp1cnc1ikmbgn96l6n23js7c2ah"; + }; +} diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix new file mode 100644 index 0000000000000..1be5d9a7c4c28 --- /dev/null +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, atpublic }: + +buildPythonPackage rec { + pname = "flufl.lock"; + version = "3.2"; + + propagatedBuildInputs = [ atpublic ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8"; + }; +} diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix new file mode 100644 index 0000000000000..ed4f950e36313 --- /dev/null +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }: + +buildPythonPackage rec { + pname = "FoxDot"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "147n2c9rwmrby8rr6xfxlh7mfm12lqk2a7v1gxlzhq1i2jj1j5h4"; + }; + + propagatedBuildInputs = [ tkinter supercollider ]; + + # Requires a running SuperCollider instance + doCheck = false; + + meta = with stdenv.lib; { + description = "Live coding music with SuperCollider"; + homepage = https://foxdot.org/; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ mrmebelman ]; + }; +} diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index f6fa41e33f83d..d7a9fd2a0b087 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "5.5.1"; + version = "5.6"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1ci6xrj4g01a97nymxpv9nj820nlmgzc4ybaz9k46i6bnxzpax7s"; + sha256 = "1k4vr5rfa62yafwpmb4827n50pwb79if0vhg1y4yqbb0bv20jxbd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index fd36c7590b5ec..0220fd1aeb9d1 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.12"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "0vdbh0ykmjsvq4vb3hrx5327q9ccl1jhbjca59lsr0v0ghwb0grz"; + sha256 = "1hxii7g4fn301vr8wg53jc1jkvbjlbaz1fbpgpn4362xcwzk73wi"; }; # No tests diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 91b8d455cdeff..a41cdada4be76 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "geojson"; - version = "2.4.1"; + version = "2.5.0"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "12k4g993qqgrhq2mgy5k8rhm5a2s2hbn769rs5fwbc5lwv4bbgxj"; + sha256 = "1filqm050ixy53kdv81bd4n80vjvfapnmzizy7jg8a6pilv17gfc"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 78986ec7d3066..6c9df6b571b0c 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -3,20 +3,19 @@ , fetchPypi , isPy3k , gevent +, gunicorn }: buildPythonPackage rec { pname = "gevent-websocket"; version = "0.10.1"; - # SyntaxError in tests. - disabled = isPy3k; src = fetchPypi { inherit pname version; sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky"; }; - propagatedBuildInputs = [ gevent ]; + propagatedBuildInputs = [ gevent gunicorn ]; meta = with stdenv.lib; { homepage = https://www.gitlab.com/noppo/gevent-websocket; diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index f49ebc3fb5d92..ecdb76173fa1e 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -48,7 +48,7 @@ else buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Enterprise scalable realtime graphing"; - maintainers = with maintainers; [ rickynils offline basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 9355db763dccc..cb6e47a600264 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.22.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab"; + sha256 = "cbc35031ec2b29af36947d085a7fbbcd8b79b84d563adf6156103d82565f78db"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 5c85dd3435788..65e9e3fb59952 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz"; + sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5"; }; nativeBuildInputs = [ cython pkgconfig ] diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index c64013624a444..00c9b86c5eba4 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "1chmxhjbs39paaxlfsdrr13v4zvv94ijvhxasdphxlxkqlycbm4a"; + sha256 = "0n13vb3v50vr04vrnql2w00gri0gcf08i0pr0q2p4w8scbsw7kjk"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index d2839d32b0a91..a07dd9e727cfa 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1dr1a5qbb9z5hyns4zk086zm0iqbms33zv0s1296wx502y7jyjfw"; + sha256 = "1nn7gad0rvy492acpyhkrp01zsk86acf34qhsvq4xmm6x39788n5"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 714a5ce10147d..e6c4086c386cb 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "2.10.1"; + version = "3.0.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "0iynzxrjmdkrriw4pcf8as8afckvmq4jk457lxg52wh29l39wb30"; + sha256 = "16x97pdr90x3xsc1xl66l7q77pgja5dzsk921by2h09k7dvxaqmh"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index f682e11bfed16..112e680ea9a5e 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Jupyter core package. A base package on which Jupyter projects rely"; homepage = https://jupyter.org/; license = licenses.bsd3; - maintainers = with maintainers; [ fridh globin ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index 74703ff5c9df9..9942168607e6d 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { homepage = http://liw.fi/larch/; description = "Python B-tree library"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 527c99a158959..590ca98802341 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "05na4izlq34bmij8awmfn58liinmsh8qzh6948knk5ms5nsh50cp"; + sha256 = "1d8dbn8wwqqvvjyhai813sqkx6366d8jkjq0gkyh51692pflmwrp"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix new file mode 100644 index 0000000000000..759c9689bc930 --- /dev/null +++ b/pkgs/development/python-modules/lazr/config.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, lazr_delegates }: + +buildPythonPackage rec { + pname = "lazr.config"; + version = "2.2.1"; + + propagatedBuildInputs = [ lazr_delegates ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1s7pyvlq06qjrkaw9r6nc290lb095n25ybzgavvy51ygpxkgqxwn"; + }; +} diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix new file mode 100644 index 0000000000000..40e2e47d517dc --- /dev/null +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -0,0 +1,15 @@ +{ buildPythonPackage, fetchPypi, nose, zope_interface }: + +buildPythonPackage rec { + pname = "lazr.delegates"; + version = "2.0.4"; + + propagatedBuildInputs = [ nose zope_interface ]; + + doCheck = false; # cannot import name 'ClassType' from 'types' + + src = fetchPypi { + inherit pname version; + sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; + }; +} diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index e6a493f7b6416..3853d796fcd68 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0daj3mkzw79v5zin2r1s2wkrz1hplfc16bwj4ss68i5qjq4l2p0j"; + sha256 = "1dj8jh5ccjv7qbydf49cw17py7z3jjkaxk4jj2gx6mq2f4w304wg"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index b707b34305686..09177f16bc6aa 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "libkeepass"; - version = "0.3.0"; + version = "0.3.1.post1"; src = fetchPypi { inherit pname version; - sha256 = "3ed79ea786f7020b14b83c082612ed8fbcc6f8edf65e1697705837ab9e40e9d7"; + sha256 = "0pwg7n9xqcjia1qmz6g48h5s31slh3mxmcqag73gq4zhl4xb6bai"; }; propagatedBuildInputs = [ lxml pycryptodome colorama ]; diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 8926a7383a776..4f090d73e60f1 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.96"; + version = "0.97"; src = fetchPypi { inherit pname version; - sha256 = "0wpahad7wac34r1hxa1jhk0bsll39n7667cljyr5251kj12ksfgr"; + sha256 = "0jw3n14x6qg5wps2w4qkqf4pyan949h1s2nbkrz2qh7xwnnp2g8p"; }; checkInputs = [ pytest cffi ]; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix new file mode 100644 index 0000000000000..95e9e4fdd3e0f --- /dev/null +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, httplib2 }: + +buildPythonPackage rec { + pname = "mailmanclient"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xsrzdrsmfhnxv68zwm1g6awk7in08k6yhkyd27ipn0mq1wjm5jd"; + }; + + propagatedBuildInputs = [ six httplib2 ]; + + meta = with stdenv.lib; { + homepage = "http://www.gnu.org/software/mailman/"; + description = "REST client for driving Mailman 3"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ peti globin ]; + }; +} diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index 6a99913c6c8bf..e770eedbfc31d 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0yq1bcsjzsz7yz4rp69izsdn47rvkld4wki2xmapp8gg2s9i8709"; }; - buildInputs = [ pytest mock ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ six ]; checkPhase = "py.test tests.py"; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 8040b80f88b83..a45a24b7a2a91 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.5.0"; + version = "5.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0x8xblc3zybp7jw9cscpm4r5pmmilj9l4yi1rkxyf0y80kchlxq4"; + sha256 = "1k2yf2yglzx65gcv2bqql6w6lmgyp3f1jz4ddq9vylf09a8j7fga"; }; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/cprogrammer1994/ModernGL; + homepage = https://github.com/moderngl/moderngl; description = "High performance rendering for Python 3"; license = licenses.mit; platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index bdfb9e2efcae4..6f11b01481b0c 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "moretools"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "f531cc79b7cd0c4aab590d5d4d0291f7cf6f083398be1dd523224b3385b732f4"; + sha256 = "1rvd9kl0163gm5kqwsb2m44x87sp72k5pirvcmhy2ffix4pzadqp"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index be6a4c7c8a5d9..8885401ae5f19 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -20,16 +20,12 @@ buildPythonPackage rec { sha256 = "b13c0b8459d6fb0688f9a4e70feeec43fa2cca05b727fc01156789596e083bb1"; }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - buildInputs = [ subunit testrepository testtools six ]; propagatedBuildInputs = [ pbr fixtures ]; - # FAIL: mox3.tests.test_mox.RegexTest.testReprWithFlags - # ValueError: cannot use LOCALE flag with a str pattern - doCheck = !isPy36; + # Disabling as several tests depdencies are missing: + # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt + doCheck = false; meta = with stdenv.lib; { description = "Mock object framework for Python"; diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/development/python-modules/mps-youtube/default.nix index 4610b052ff8af..39ad7c472153e 100644 --- a/pkgs/development/python-modules/mps-youtube/default.nix +++ b/pkgs/development/python-modules/mps-youtube/default.nix @@ -1,20 +1,17 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k , pafy }: buildPythonPackage rec { pname = "mps-youtube"; - version = "0.2.7.1"; + version = "0.2.8"; disabled = (!isPy3k); src = fetchFromGitHub { owner = "mps-youtube"; repo = "mps-youtube"; rev = "v${version}"; - sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys"; + sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y"; }; propagatedBuildInputs = [ pafy ]; @@ -29,11 +26,10 @@ buildPythonPackage rec { export XDG_CONFIG_HOME=$(pwd)/check-phase ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal based YouTube player and downloader"; homepage = https://github.com/np1/mps-youtube; license = licenses.gpl3; maintainers = with maintainers; [ odi ]; }; - } diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index cd9ca9451b8b0..f5ae020c71c66 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -1,25 +1,33 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pkgs +{ stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27 +, mpv }: buildPythonPackage rec { pname = "mpv"; - version = "0.1"; + version = "0.3.9"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw"; + src = fetchFromGitHub { + owner = "jaseg"; + repo = "python-mpv"; + rev = "v${version}"; + sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q"; }; - buildInputs = [ pkgs.mpv ]; - patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so"; + buildInputs = [ mpv ]; + + postPatch = '' + substituteInPlace mpv.py \ + --replace "sofile = ctypes.util.find_library('mpv')" \ + 'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"' + ''; + + # tests impure, will error if it can't load libmpv.so + checkPhase = "${python.interpreter} -c 'import mpv'"; meta = with stdenv.lib; { description = "A python interface to the mpv media player"; homepage = "https://github.com/jaseg/python-mpv"; license = licenses.agpl3; }; - } diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index c43c45df600c6..488f6f9a7bb54 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.4.2.post1"; + version = "1.4.4"; nativeBuildInputs = [ mysql.connector-c @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7"; + sha256 = "1379hab7spjp9v5fypqgy0b8vr8vnalxahm9hcsxvj2xbb2pqwww"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 91e6e5f0fd6a0..e8d2c209eb588 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "c01ec7d0bc093420a45d8b5ea8261a84ba12bff0cabf47cb15b716c5ea8f3d23"; + sha256 = "1kc2phcz22r7vim3hmq0vrp2zqxl6v49hq40jmp4p81pdvgh5c6b"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 11552a7c342e1..69828b2b18ffc 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Converting Jupyter Notebooks"; homepage = https://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index c0485eef4d3d7..79900197133a2 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "A tool to merge/concatenate Jupyter (IPython) notebooks"; inherit (src.meta) homepage; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ globin ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 6e9b5ce61cd26..ef6d51cb19a4d 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k }: buildPythonPackage rec { - version = "3.4.4"; + version = "3.4.5"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1dbwwhsbsp31bvvksq7kyrfs6s27lp8wgwqs4qf6hajkz2jj0k3n"; + sha256 = "153x2clrnigs74jdgnn3qmljdjj4gprmvpdvh49i18ls4m8mbm5y"; }; propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 34a81a66ec9db..1c38918c14772 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - version = "0.6.1"; + version = "0.7.0"; pname = "node-semver"; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; + sha256 = "1p7ink1wajkc31r05k1yn37gk377033a9vhin8v4j757d4ha1f91"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 556fcfb31f5f5..431d4bb4d563e 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = https://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index d0ce48774c3a5..0266432668529 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "1sz9ls6a7h056nc5q76w4xl43sr1h9in2f23qwkxazcazr3zpi3p"; + sha256 = "1kav0jlgdpgwx4am09ja7cr8s1g8h8a7j8mcfy1cfjr8fficg2g4"; }; propagatedBuildInputs = [ jsonschema pyyaml six ] diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 82d9107bfddec..daaf845cdf0bb 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "parsel"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "9ccd82b8a122345601f6f9209e972c0e8c3518a188fcff2d37cb4d7bc570b4b8"; + sha256 = "08v76s6s4li7asnyz8a7gbp9vz522rv5apranyv76mb0lhmjd92d"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index c797c57c40f99..0d6edcbd3f48f 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -5,12 +5,11 @@ buildPythonPackage rec { pname = "pdfkit"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "1p1m6gp51ql3wzjs2iwds8sc3hg1i48yysii9inrky6qc3s6q5vf"; + sha256 = "1lcc1njpjd2zadbljqsnkrvamschl6j099p4giz1jd6mg1ds67gg"; }; # tests are not distributed diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index bfc9f5a1f7c6e..afb805c0b7eb6 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.9.6"; + version = "3.10.0"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1pgmsd7v73d0gqxsa4wnm9s3lyffw46wvvkqn25xgh4v8z869fg2"; + sha256 = "166h7vy3j0v4h2jnyiwpmpqgmn95381a5ra40ghghy0fqd9v49g8"; }; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index b86706bef081a..b9c4a62f0de0c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.15"; + version = "8.10.16"; src = fetchPypi { inherit pname version; - sha256 = "617b9127dc6fd29765ca122915d3b603131446a76a587deed0b92c8db53963fe"; + sha256 = "1cfkyz991nbqsak3mdwybaxvzqbdcqivxnl84n8p4dyi5lk45v4b"; }; meta = { diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 555f64bd42d1c..5cd6c10682690 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0iw0j2jwlbzknpbdpaqrjjlbycbwqhavp1crblvihf03knn7nkxz"; + sha256 = "166rscpr9xbs3pwd61mivhlm1gv3chkgpk2cy0fpb86axa7z4cwk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix index ba5ede1ad771d..adcb71104676e 100644 --- a/pkgs/development/python-modules/potr/default.nix +++ b/pkgs/development/python-modules/potr/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "A pure Python OTR implementation"; homepage = "http://python-otr.pentabarf.de/"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 80b17034aa03c..163477a272511 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -14,10 +14,8 @@ in buildPythonPackage rec { sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool libcangjie sqlite cython - ]; + nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ]; + buildInputs = [ libcangjie sqlite ]; preConfigure = '' find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index ef5996f32c786..ead5a24bbdbe5 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "3.2.2"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - sha256 = "17l7nlnpqjgnrw4hzs52lbzmdxa1vm3v51mm33l4c43c1md5m2ns"; + sha256 = "1fhh3djb6chs23j46hwzm1rd6hypkl517vjmmg44rxnslkcl7dhb"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 93ea1e6734bea..066e849f0aab3 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -38,7 +38,10 @@ buildPythonPackage rec { checkPhase = '' pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ - and not test_keyfunction_bogus_return" + and not test_keyfunction_bogus_return \ + and not test_libcurl_ssl_gnutls \ + and not test_libcurl_ssl_nss \ + and not test_libcurl_ssl_openssl" ''; preConfigure = '' diff --git a/pkgs/development/python-modules/pydot_ng/default.nix b/pkgs/development/python-modules/pydot_ng/default.nix index ba754e9959bf3..d48ddaccd5857 100644 --- a/pkgs/development/python-modules/pydot_ng/default.nix +++ b/pkgs/development/python-modules/pydot_ng/default.nix @@ -1,10 +1,9 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27 +, graphviz +, mock , pyparsing , pytest , unittest2 -, pkgs }: buildPythonPackage rec { @@ -16,19 +15,22 @@ buildPythonPackage rec { sha256 = "8c8073b97aa7030c28118961e2c6c92f046e4cb57aeba7df87146f7baa6530c5"; }; - buildInputs = [ pytest unittest2 ]; - propagatedBuildInputs = [ pkgs.graphviz pyparsing ]; + propagatedBuildInputs = [ graphviz pyparsing ]; + + checkInputs = [ + graphviz + mock + pytest + ] ++ lib.optionals isPy27 [ unittest2]; checkPhase = '' - mkdir test/my_tests - py.test test + pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/pydot-ng"; description = "Python 3-compatible update of pydot, a Python interface to Graphviz's Dot"; license = licenses.mit; - maintainers = [ maintainers.bcdarwin ]; + maintainers = with maintainers; [ bcdarwin jonringer ]; }; - } diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index aae37e0282ff7..e303f3415d7f3 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "pyglet"; src = fetchPypi { inherit pname version; - sha256 = "132p484g53b9p8g3q2bcnhzyg9x37hsm4rhpscl4llngjw5fbk22"; + sha256 = "1dxxrl4nc7xh3aai1clgzvk48bvd35r7ksirsddz0mwhx7jmm8px"; }; # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307). diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 4fe7816d4fdcc..c07f1b46cbe1a 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { homepage = http://www.pykka.org; description = "A Python implementation of the actor model"; license = licenses.asl20; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index e7cd0872c76a1..1e567a9935cbf 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "3.4.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cwgqvpqn59y3zq4wv35m1v4jrh3ih6zbyv30g5nxbw13vddxr92"; + sha256 = "196pab5whswy3bgi2s842asjhyka2f9mw98m84bvqjmfw0m7x4y0"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index d78a5f55aadc2..8064d9b6d5751 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.26"; + version = "4.0.27"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5"; + sha256 = "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib"; }; buildInputs = [ unixODBC ]; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 1392956ef0367..1b8fffa1d2942 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, requests, geojson }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, requests, geojson }: buildPythonPackage rec { pname = "pyowm"; version = "2.10.0"; + disabled = pythonOlder "3.3"; + src = fetchPypi { inherit pname version; sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7"; @@ -14,8 +16,7 @@ buildPythonPackage rec { # This may actually break the package. postPatch = '' substituteInPlace setup.py \ - --replace "requests>=2.18.2,<2.19" "requests" \ - --replace "geojson>=2.3.0,<2.4" "geojson<2.5,>=2.3.0" + --replace "requests>=2.18.2,<2.19" "requests" ''; # No tests in archive diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 7d745aa9e105e..b48f21b9e78db 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, pythonPackages, pkgconfig , qmake, qtbase, qtsvg, qtwebengine +, wrapQtAppsHook }: let @@ -77,9 +78,12 @@ in buildPythonPackage rec { doCheck = true; - enableParallelBuilding = true; + passthru = { + inherit wrapQtAppsHook; + }; + meta = with lib; { description = "Python bindings for Qt5"; homepage = http://www.riverbankcomputing.co.uk; diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index 0f4b2b688cd90..ae17ed351050f 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pysocks"; - version = "1.6.8"; + version = "1.7.0"; src = fetchPypi { pname = "PySocks"; inherit version; - sha256 = "3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672"; + sha256 = "0z4p31bpqm893cf87qqgb30k7nwd8kqfjwwjm5cvxb6zbyj1w0yr"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index 39671041d8a69..9316e85b2608e 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { homepage = http://pyspotify.mopidy.com; description = "A Python interface to Spotify’s online music streaming service"; license = licenses.unfree; - maintainers = with maintainers; [ lovek323 rickynils ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 547e52edbd209..72be3227e6cb7 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.2.7"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "0vyv6wnch1l5kcxqzngakx948qz90q604bl5h93x54381lq3ndj6"; + sha256 = "1mjr3pa4fycdsl7xk9s8fpn2vhpgx7mrdnn5h4lyyjhz86195ivg"; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 3085ee06e8700..0ef79cd09894d 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , ansible , pytest , mock @@ -8,11 +8,13 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "2.0.2"; + version = "2.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f"; + src = fetchFromGitHub { + owner = "ansible"; + repo = "pytest-ansible"; + rev = "v${version}"; + sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0"; }; patchPhase = '' @@ -24,11 +26,11 @@ buildPythonPackage rec { checkInputs = [ mock ]; propagatedBuildInputs = [ ansible pytest ]; - # tests not included with release + # tests not included with release, even on github doCheck = false; checkPhase = '' - pytest + HOME=$TMPDIR pytest tests/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index 0669c22f92111..afd36155cf788 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { }) ]; - buildInputs = [ setuptools_scm pytest ]; + buildInputs = [ setuptools_scm ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 084432061d1ea..6b25ba93ef9ba 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.27.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "158wxj2w880jrab7mi4fb3xqnjhmfixqacxjp7whf7jy3zxqrq38"; + sha256 = "0xa0zw7hlfqqa305ic4csgfmlbxhklb5xzx72mfkcz8gcc0f5qwd"; }; # The tests require all the providers, disable otherwise. diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix new file mode 100644 index 0000000000000..e6425c3004781 --- /dev/null +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "python-unshare"; + # pypi version doesn't support Python 3 and the package didn't update for a long time: + # https://github.com/TheTincho/python-unshare/pull/8 + version = "unstable-2018-05-20"; + + src = fetchFromGitHub { + owner = "TheTincho"; + repo = "python-unshare"; + rev = "4e98c177bdeb24c5dcfcd66c457845a776bbb75c"; + sha256 = "1h9biinhy5m7r2cj4abhvsg2hb6xjny3n2dxnj1336zpa082ys3h"; + }; + + meta = with stdenv.lib; { + description = "Python bindings for the Linux unshare() syscall"; + homepage = "https://github.com/thetincho/python-unshare"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; + +} diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 9762fd280e06b..1a4fdff5812c2 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.24"; + version = "1.0.25"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "0k5y4h0c4cjn1xl5fayh3a001kl42vvrhjyhp5r2fwn22z56a02p"; + sha256 = "15m0ajcrxjdzahdkxa3mylk87l31zz48k99bvmmx96hcl31cf347"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index d5305781ef5c8..7042b42f7ed8a 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "162rad86slg4gmzxy33pnyyzm4hhcszcpjpw1vk79f3gxzvy8j8x"; + sha256 = "11164sy9vwphf7iw60n4hmns2q6anazrkhc15lwi6sb2qmkjc541"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 907f87dcd4746..13a946aeafd05 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ click colorama ]; - meta = { + meta = with lib; { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ "1000101" ]; + license = licenses.mit; + maintainers = [ maintainers."1000101" ]; }; } diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index bf76166d73b44..7839a77f9f5ec 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage -, fetchdarcs +, fetchFromGitHub , isPy3k , pkgs , cython @@ -14,13 +14,14 @@ buildPythonPackage rec { pname = "sipsimple"; - version = "3.1.1"; + version = "3.4.2"; disabled = isPy3k; - src = fetchdarcs { - url = http://devel.ag-projects.com/repositories/python-sipsimple; + src = fetchFromGitHub { + owner = "AGProjects"; + repo = "python-sipsimple"; rev = "release-${version}"; - sha256 = "0jdilm11f5aahxrzrkxrfx9sgjgkbla1r0wayc5dzd2wmjrdjyrg"; + sha256 = "094xf343d6zjhg9jwbm3dr74zq264cyqnn22byvm2m88lnagmhmr"; }; preConfigure = '' @@ -32,7 +33,7 @@ buildPythonPackage rec { buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SIP SIMPLE implementation for Python"; homepage = http://sipsimpleclient.org/; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index badc99f5e3778..b513a9f33c8c5 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "spark_parser"; - version = "1.8.7"; + version = "1.8.9"; src = fetchPypi { inherit pname version; - sha256 = "4c5e6064afbb3c114749016d585b0e4f9222d4ffa97a1854c9ab70b25783ef48"; + sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 1212b6c94b0c5..ef30b6917a3b7 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.34.0"; + version = "0.34.2"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "0rlixs084isgxsvvpz96njqzikvg8x021sgjp4yj71jpd8blvg8f"; + sha256 = "126c9p8rnnb043w57ah7idqfryczbz4vi9lzsz2cgiaig6fv52b6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 37091da1b4990..4b5ad014b9738 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7"; + sha256 = "1k9vmw0kcbkij9lbz80imkwkhq24vgrqf1i95kv8y5aaarjda6mx"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 43134fb746d8e..899e893684368 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -118,7 +118,7 @@ let keras-applications # libs taken from system through the TF_SYS_LIBS mechanism - grpc + # grpc sqlite openssl jsoncpp @@ -169,7 +169,8 @@ let "flatbuffers" "gast_archive" "gif_archive" - "grpc" + # Lots of errors, requires an older version + # "grpc" "hwloc" "icu" "jpeg" @@ -245,8 +246,7 @@ let ''; # FIXME: Tensorflow uses dlopen() for CUDA libraries. - # No idea why gpr isn't linked properly; perhaps Tensorflow expects a static library? - NIX_LDFLAGS = [ "-lgpr" ] ++ lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; + NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; hardeningDisable = [ "format" ]; @@ -261,15 +261,14 @@ let bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; fetchAttrs = { - preInstall = '' - rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} - ''; + # So that checksums don't depend on these. + TF_SYSTEM_LIBS = null; # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1rbzvir569ch33bpvm47byx954vr80rjnzrbgs4rg3bqww73hr3k" + "196pm3ynfafqlcxah07hkvphf536hpix1ydgsynr1yg08aynlvvx" else - "1wnhma450zh72raiq7ddd9lyq3a056cjqiy6i7y4sidiy09ncvcg"; + "138r85n27ijzwxfwb5pcfyb79v14368jpckw0vmciz6pwf11bd9g"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index 843f26508ae49..094c01eef78b3 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { homepage = http://liw.fi/tracing/; description = "Python debug logging helper"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 12e881536963d..47aa23ca1143a 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -40,10 +40,10 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np prusnak mmahut "1000101" ]; + license = licenses.gpl3; + maintainers = with maintainers; [ np prusnak mmahut maintainers."1000101" ]; }; } diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 4cd4776f0da94..21a3c5d6d08f1 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trollius"; - version = "2.2"; + version = "2.2.post1"; src = fetchPypi { inherit pname version; - sha256 = "093978388qvw5hyscbbj062dbdc2761xs9yzrq26mh63g689lnxk"; + sha256 = "06s44k6pcq35vl5j4i2pgkpb848djal818qypcvx44gyn4azjrqn"; }; checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2; diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix index 042b4a1964216..bce0ad8d7c0c1 100644 --- a/pkgs/development/python-modules/ttystatus/default.nix +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { homepage = http://liw.fi/ttystatus/; description = "Progress and status updates on terminals for Python"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix index 2c3ee66663f64..d59a0bb8b8a45 100644 --- a/pkgs/development/python-modules/txamqp/default.nix +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { homepage = https://launchpad.net/txamqp; description = "Library for communicating with AMQP peers and brokers using Twisted"; license = licenses.asl20; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 6e357f307e3ad..f2c02c8a6c67b 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.1"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "18b184110cbe31303d25a7bc7f73d51b9cb4e15563cb9aa25ccfbd0ebe07d448"; + sha256 = "07kahmr0vfmncf8y4x6ldjrghnd4gsf0fwykgjj5ijvqi9xc21xs"; }; buildInputs = [ nose numpy ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 9387ba7780168..f85c28b7f5792 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0glsl57ha0d4pn5q318dmzml7crml1h8yilbhxh768wcs2030s1g"; + sha256 = "06s0lym5md59pj8w89acnwk0i0hh92az187h4gz22mb849h308pw"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 365a65950f14f..885595ef6d4bf 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,32 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch }: +{ stdenv, buildPythonPackage, fetchPypi }: -buildPythonPackage (rec { +buildPythonPackage rec { pname = "urwid"; - version = "1.3.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; + sha256 = "1g6cpicybvbananpjikmjk8npmjk4xvak1wjzji62wc600wkwkb4"; }; - patches = [ - # fix tests - (fetchpatch { - url = "https://github.com/urwid/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch"; - sha256 = "0azpn0ylbg8mfpr0y27n4lnq0ph75a4d4m9wdv3napnhf1vh9ahx"; - }) - # fix tests - (fetchpatch { - url = "https://github.com/floppym/urwid/commit/f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3.patch"; - sha256 = "1b3vz7mrwz2bqvdwvbyv2j835f9lzapgw0j2km4sam76bxmgfpgq"; - }) - ]; - - postPatch = '' - # Several tests keep failing on Hydra - rm urwid/tests/test_vterm.py - ''; - meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; @@ -34,4 +16,4 @@ buildPythonPackage (rec { license = licenses.lgpl21; maintainers = with maintainers; [ ]; }; -}) +} diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 29515f75c9e0a..4c550e073c3f1 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.1.0"; + version = "2.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f"; + sha256 = "0ggiisrq7cbk307d09fdwfdcjb667jv90lx6gfwhxfpxgq66cccb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index b45a46b3a8397..70512edf40018 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.11.5"; + version = "0.11.7"; src = fetchPypi { inherit pname version; - sha256 = "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef"; + sha256 = "0mplkcpb5d8wjf8vk195fys4y6a3wbibiyf708imw33lphfk9g1a"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index b71bc7dc928d9..c0d2d744f0969 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "w3lib"; - version = "1.20.0"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "1mqwlc1cr15jxr3gr8pqqh5gf0gppm2kcvdi8vid6y8wmq9bjkg5"; + sha256 = "05a3fxi4f43n0dc87lizsy2h84dxvqjy0q6rhkyabdbhypz5864b"; }; buildInputs = [ six pytest ]; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index f9565d8e6a055..407bb88fa2ae3 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Fixed size round-robin style database"; - maintainers = with maintainers; [ rickynils offline basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 60f0f3cc96961..141b499453edf 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://ws4py.readthedocs.org; description = "A WebSocket package for Python"; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix new file mode 100644 index 0000000000000..36aaf0ec8ceb3 --- /dev/null +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: + +buildPythonPackage rec { + pname = "wsproto"; + version = "0.14.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; + }; + + propagatedBuildInputs = [ h11 enum34 ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Pure Python, pure state-machine WebSocket implementation"; + homepage = https://github.com/python-hyper/wsproto/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 36aaf0ec8ceb3..dfbf9ceabdc32 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy36 +, dataclasses +, h11 +, pytest +}: buildPythonPackage rec { pname = "wsproto"; - version = "0.14.1"; + version = "0.15.0"; + disabled = pythonOlder "3.6"; # python versions <3.6 src = fetchPypi { inherit pname version; - sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; + sha256 = "17gsxlli4w8am1wwwl3k90hpdfa213ax40ycbbvb7hjx1v1rhiv1"; }; - propagatedBuildInputs = [ h11 enum34 ]; + propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index c953fe9fe1e3f..9f6e9866cef37 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -1,8 +1,11 @@ { lib +, stdenv +, openglSupport ? true +, libX11 +, pyopengl , buildPythonPackage , fetchPypi , pkgconfig -, gtk3 , libjpeg , libtiff , SDL @@ -11,6 +14,16 @@ , freeglut , xorg , which +, cairo +, requests +, pango +, pathlib2 +, python +, doxygen +, ncurses +, libpng +, gstreamer +, wxGTK }: buildPythonPackage rec { @@ -22,14 +35,43 @@ buildPythonPackage rec { sha256 = "35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37"; }; - nativeBuildInputs = [ - pkgconfig - ]; + doCheck = false; - buildInputs = [ - gtk3 libjpeg libtiff SDL gst-plugins-base libnotify freeglut xorg.libSM - which - ]; + nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; + + buildInputs = [ libjpeg libtiff SDL + gst-plugins-base libnotify freeglut xorg.libSM ncurses + requests libpng gstreamer libX11 + pathlib2 + (wxGTK.gtk) + ] + ++ lib.optional openglSupport pyopengl; + + hardeningDisable = [ "format" ]; + + DOXYGEN = "${doxygen}/bin/doxygen"; + + preConfigure = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ + --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' + substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ + --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ + ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), + ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), + ("appsvc", None) + ]}' + ''; + + buildPhase = '' + ${python.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py + ''; + + installPhase = '' + ${python.interpreter} setup.py install --skip-build --prefix=$out + wrapPythonPrograms + ''; + + passthru = { inherit wxGTK openglSupport; }; meta = { @@ -38,4 +80,4 @@ buildPythonPackage rec { license = lib.licenses.wxWindows; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix new file mode 100644 index 0000000000000..c15f2682e63c5 --- /dev/null +++ b/pkgs/development/python-modules/xapian/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchurl, python +, sphinx +, xapian +}: + +let + pythonSuffix = lib.optionalString python.isPy3k "3"; +in +buildPythonPackage rec { + pname = "xapian"; + inherit (xapian) version; + format = "other"; + + src = fetchurl { + url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; + sha256 = "0j9awiiw9zf97r60m848absq43k37gghpyw7acxqjazfzd71fxvm"; + }; + + configureFlags = [ + "--with-python${pythonSuffix}" + "PYTHON${pythonSuffix}_LIB=${placeholder "out"}/${python.sitePackages}" + ]; + + preConfigure = '' + export XAPIAN_CONFIG=${xapian}/bin/xapian-config + ''; + + buildInputs = [ sphinx xapian ]; + + doCheck = true; + + checkPhase = '' + ${python.interpreter} python${pythonSuffix}/smoketest.py + ${python.interpreter} python${pythonSuffix}/pythontest.py + ''; + + meta = with lib; { + description = "Python Bindings for Xapian"; + homepage = https://xapian.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index e5d06a3c69430..5fc7f55d4197d 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,18 +1,18 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub +, click , pytest , six -, click }: buildPythonPackage rec { pname = "xdis"; - version = "4.0.1"; + version = "4.0.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1ifakxxawyxw4w4p58m4xdc0c955miqyaq3dfbl386ipw0f50kyz"; + src = fetchFromGitHub { + owner = "rocky"; + repo = "python-xdis"; + rev = version; + sha256 = "1h4j8hincf49zyd0rvn4bh0ypj8836y8vz3d496ycb9gjzkr6044"; }; checkInputs = [ pytest ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { make check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = https://github.com/rocky/python-xdis/; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b22b9554fa61d..5c738c11f84cf 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.16.0"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1bw39aiyqspjsxps5m3skaszih8vap8kyialbzg7jjc080nyqkws"; + sha256 = "04xarlbh59f9ah53jxrcpqpzladyfxaw6cb2g8clw9aid0qzi9kh"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 81e5d0fbc8153..42f0218c84633 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "0.1.4"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a7838b2f21bc06b7e3db5c64ffa6642255a5f7c01841660b3388a9840e101f99"; + sha256 = "04532600mnsvzv43l2jvjrn7sflg0wkjqzy7nj7m3vvxm5gd4kg3"; }; buildInputs = [ pytest ]; |