Merge staging-next into staging

pkgs/development/python-modules/awkward/default.nix

@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "0.11.1";
+  version = "0.12.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07m797jc5lpaj6m8469d67l2s43jf8w0mfhy0hfvbfs4mk0cjix0";
+    sha256 = "0xvphwpa1n5q7kim4dw6fmsg9h5kkk7nd51bv9b36i3n4hilmq32";
   };
 
   nativeBuildInputs = [ pytestrunner ];

pkgs/development/python-modules/azure-mgmt-resource/default.nix

@@ -8,13 +8,13 @@
 
 
 buildPythonPackage rec {
-  version = "2.1.0";
+  version = "2.2.0";
   pname = "azure-mgmt-resource";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be";
+    sha256 = "173pxgly95dwblp4nj4l70zb0gasibgcjmcynxwa5282plynhgdw";
   };
 
   postInstall = if isPy3k then "" else ''

pkgs/development/python-modules/boolean-py/default.nix

@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "boolean.py";
+  version = "3.6";
+
+  src = fetchFromGitHub {
+    owner = "bastikr";
+    repo = "boolean.py";
+    rev = "v${version}";
+    sha256 = "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/bastikr/boolean.py";
+    description = "Implements boolean algebra in one module";
+    license = licenses.bsd2;
+  };
+
+}

pkgs/development/python-modules/click-default-group/default.nix

@@ -1,20 +1,20 @@
-{ lib, buildPythonPackage, fetchFromGitHub, click, pytest_3 }:
+{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }:
 
 buildPythonPackage rec {
   pname = "click-default-group";
-  version = "1.2";
+  version = "1.2.1";
 
   # No tests in Pypi tarball
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-default-group";
     rev = "v${version}";
-    sha256 = "0lm2k4jvy4ilvv91niawklfnp5mp7wa8c1bicsqdfzrxmw7jliwp";
+    sha256 = "1wdmabfpmzxpiww0slinvxm9xjyxql250dn1pvjijq675pxafiz4";
   };
 
   propagatedBuildInputs = [ click ];
 
-  checkInputs = [ pytest_3 ];
+  checkInputs = [ pytest ];
 
   meta = with lib; {
     homepage = https://github.com/click-contrib/click-default-group;

pkgs/development/python-modules/dask/default.nix

@@ -1,7 +1,10 @@
 { lib
+, bokeh
 , buildPythonPackage
 , fetchPypi
+, fsspec
 , pytest
+, pythonOlder
 , cloudpickle
 , numpy
 , toolz
@@ -12,15 +15,18 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "1.2.2";
+  version = "2.2.0";
+
+  disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c";
+    sha256 = "0wkiqkckwy7fv6m86cs3m3g6jdikkkw84ki9hiwp60xpk5xngnf0";
   };
 
   checkInputs = [ pytest ];
-  propagatedBuildInputs = [ cloudpickle  numpy toolz dill pandas partd ];
+  propagatedBuildInputs = [
+    bokeh cloudpickle dill fsspec numpy pandas partd toolz ];
 
   checkPhase = ''
     py.test dask

pkgs/development/python-modules/django-logentry-admin/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }:
+
+buildPythonPackage rec {
+  pname = "django-logentry-admin";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "yprez";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1ji04qklzhjb7fx6644vzikjb2196rxyi8hrwf2knsz41ndvq1l9";
+  };
+
+  checkInputs = [ pytest pytest-django ];
+  checkPhase = ''
+    rm -r logentry_admin __init__.py
+    pytest
+  '';
+
+  propagatedBuildInputs = [ django ];
+
+  meta = with stdenv.lib; {
+    description = "Show all LogEntry objects in the Django admin site";
+    homepage = "https://github.com/yprez/django-logentry-admin";
+    license = licenses.isc;
+    maintainers = with maintainers; [ mrmebelman ];
+  };
+}
+

pkgs/development/python-modules/django-polymorphic/default.nix

@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
-  version = "2.0.3";
+  version = "2.1.2";
 
   # PyPI tarball is missing some test files
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "08qk3rbk0xlphwalkigbhqpmfaqjk1sxmlfh8zy8s8dw7fw1myk4";
+    sha256 = "0zghrq7y7g2ls38cz6y98qj5xwnn992slhb95qyp6l66d420j179";
   };
 
   checkInputs = [ dj-database-url ];

pkgs/development/python-modules/fastpair/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest_3, scipy }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }:
 
 buildPythonPackage {
   pname = "fastpair";
@@ -11,14 +11,17 @@ buildPythonPackage {
     sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71";
   };
 
-  nativeBuildInputs = [ (pytestrunner.override { pytest = pytest_3; }) ];
+  nativeBuildInputs = [ pytestrunner ];
 
-  checkInputs = [ pytest_3 ];
+  checkInputs = [ pytest ];
 
   propagatedBuildInputs = [
     scipy
   ];
 
+  # Does not support pytest 4 https://github.com/carsonfarmer/fastpair/issues/14
+  doCheck = false;
+
   checkPhase = ''
     pytest fastpair
   '';

pkgs/development/python-modules/folium/default.nix

@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "66901483808839ed895a685ca7bc4731379f4a627d73a83b77f0df1847b14892";
+    sha256 = "18fzxijsgrb95r0a8anc9ba5ijyw3nlnv3rpavfbkqa5v878x84f";
   };
 
   disabled = pythonOlder "3.5";

pkgs/development/python-modules/fsspec/default.nix

@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "fsspec";
+  version = "0.4.1";
+
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0fvm1kdnnbf0pppv23mlfdqh220gcldmv72w2rdxp6ks1rcphzg3";
+  };
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A specification that python filesystems should adhere to.";
+    homepage = "https://github.com/intake/filesystem_spec";
+    license = licenses.bsd3;
+  };
+}

pkgs/development/python-modules/git-revise/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonAtLeast
+, tox
+, pytest
+, pylint
+, mypy
+, black
+}:
+
+buildPythonPackage rec {
+  pname = "git-revise";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mq1fh8m6jxl052d811cgpl378hiq20a8zrhdjn0i3dqmxrcb8vs";
+  };
+
+  disabled = !(pythonAtLeast "3.6");
+
+  checkInputs = [ tox pytest pylint mypy black ];
+
+  checkPhase = ''
+    tox
+  '';
+
+  meta = with lib; {
+    description = "Efficiently update, split, and rearrange git commits";
+    homepage = https://github.com/mystor/git-revise;
+    license = licenses.mit;
+    maintainers = with maintainers; [ emily ];
+  };
+}

pkgs/development/python-modules/google-api-python-client/default.nix

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.7.10";
+  version = "1.7.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mlx5dvkh6rjkvkd91flyhrmji2kw9rlr05n8n4wccv2np3sam9f";
+    sha256 = "137vwb9544vjxkwnbr98x0f4p6ri5i678wxxxgbsx4kdyrs83a58";
   };
 
   # No tests included in archive

pkgs/development/python-modules/ipdb/default.nix

@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ipdb";
-  version = "0.12";
+  version = "0.12.2";
   disabled = isPyPy;  # setupterm: could not find terminfo database
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dce2112557edfe759742ca2d0fee35c59c97b0cc7a05398b791079d78f1519ce";
+    sha256 = "0mzfv2sa8qabqzh2vqgwhavb15gsmcgqn6i3jgq6b5q9i9wxsgs7";
   };
 
   propagatedBuildInputs = [ ipython ];

pkgs/development/python-modules/license-expression/default.nix

@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, boolean-py
+}:
+
+buildPythonPackage rec {
+  pname = "license-expression";
+  version = "0.999";
+
+  src = fetchFromGitHub {
+    owner = "nexB";
+    repo = "license-expression";
+    rev = "v${version}";
+    sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
+  };
+
+  propagatedBuildInputs = [ boolean-py ];
+
+  meta = with lib; {
+    homepage = "https://github.com/nexB/license-expression";
+    description = "Utility library to parse, normalize and compare License expressions for Python using a boolean logic engine";
+    license = licenses.asl20;
+  };
+
+}

pkgs/development/python-modules/matchpy/default.nix

@@ -1,9 +1,10 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , hopcroftkarp
 , multiset
-, pytest_3
+, pytest
 , pytestrunner
 , hypothesis
 , setuptools_scm
@@ -20,12 +21,23 @@ buildPythonPackage rec {
     sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r";
   };
 
+  patches = [
+    # Fix tests for pytest 4. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/HPAC/matchpy/commit/b405a2717a7793d58c47b2e2197d9d00c06fb13c.patch";
+      includes = [ "tests/conftest.py" ];
+      sha256 = "1b6gqf2vy9qxg384nqr9k8il335afhbdmlyx4vhd8r8rqpv7gax9";
+    })
+  ];
+
   postPatch = ''
-    substituteInPlace setup.cfg --replace "hypothesis>=3.6,<4.0" "hypothesis"
+    substituteInPlace setup.cfg \
+       --replace "hypothesis>=3.6,<4.0" "hypothesis" \
+       --replace "pytest>=3.0,<4.0" "pytest"
   '';
 
   buildInputs = [ setuptools_scm pytestrunner ];
-  checkInputs = [ pytest_3 hypothesis ];
+  checkInputs = [ pytest hypothesis ];
   propagatedBuildInputs = [ hopcroftkarp multiset ];
 
   meta = with lib; {

pkgs/development/python-modules/plotly/default.nix

@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "3.10.0";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "164aav7i3ann1lv3xbb76ylpph4hissl0wsnmil1s3m0r7sk7jsx";
+    sha256 = "0iw0j2jwlbzknpbdpaqrjjlbycbwqhavp1crblvihf03knn7nkxz";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/poyo/default.nix

@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.2";
+  version = "0.5.0";
   pname = "poyo";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07fdxlqgnnzb8r6lasvdfjcbd8sb9af0wla08rbfs40j349m8jn3";
+    sha256 = "1pflivs6j22frz0v3dqxnvc8yb8fb52g11lqr88z0i8cg2m5csg2";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/pybindgen/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }:
 buildPythonPackage rec {
   pname = "PyBindGen";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "23f2b760e352729208cd4fbadbc618bd00f95a0a24db21a4182833afcc3b5208";
+    sha256 = "0l9pz4s7p82ddf9nq56y1fk84j5dbsff1r2xnfily0m7sahyvc8g";
   };
 
   buildInputs = [ setuptools_scm ];

pkgs/development/python-modules/pyhepmc/default.nix

@@ -42,9 +42,9 @@ buildPythonPackage rec {
   '';
 
   nativeBuildInputs = [ pkgs.swig ];
-  buildInputs = [ pkgs.hepmc ];
+  buildInputs = [ pkgs.hepmc2 ];
 
-  HEPMCPATH = pkgs.hepmc;
+  HEPMCPATH = pkgs.hepmc2;
 
   checkPhase = ''
     ${python.interpreter} test/test1.py

pkgs/development/python-modules/pysnmp/default.nix

@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.4.10";
   pname = "pysnmp";
+  version = "4.4.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bbcnn49krawq8pkhpzc427yxki0kxjndhhn61140j3wjbvavhah";
+    sha256 = "1v7vz045pami4nx5hfvk8drarcswjclb0pfmg932x95fddbdx2zy";
   };
 
   # NameError: name 'mibBuilder' is not defined

pkgs/development/python-modules/pysonos/default.nix

@@ -7,28 +7,32 @@
 , ifaddr
 
 # Test dependencies
-, pytest_3, pylint, flake8, graphviz
+, pytest, pylint, flake8, graphviz
 , mock, sphinx, sphinx_rtd_theme
 }:
 
 buildPythonPackage rec {
   pname = "pysonos";
-  version = "0.0.21";
+  version = "0.0.22";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x2nznjnm721qw9nys5ap3b6hq9s48bsd1yj5xih50pvn0rf0nz2";
+    sha256 = "4a4fe630b97c81261246a448fe9dd2bdfaacd7df4453cf72f020599171416442";
   };
 
   propagatedBuildInputs = [ xmltodict requests ifaddr ];
 
   checkInputs = [
-    pytest_3 pylint flake8 graphviz
+    pytest pylint flake8 graphviz
     mock sphinx sphinx_rtd_theme
   ];
 
+  checkPhase = ''
+    pytest --deselect=tests/test_discovery.py::TestDiscover::test_discover
+  '';
+
   meta = {
     homepage = https://github.com/amelchio/pysonos;
     description = "A SoCo fork with fixes for Home Assistant";

pkgs/development/python-modules/runway-python/default.nix

@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "runway-python";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ef15c0df60cfe7ea26b070bbe2ba522d67d247b157c20f3f191fe545c17d0b85";
+    sha256 = "cd23550211aa8542d9c06516e25c32de3963fff50d0793d94def271a4e2b4514";
   };
 
   propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ];

pkgs/development/python-modules/simplefix/default.nix

@@ -0,0 +1,25 @@
+{ lib, python, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "simplefix";
+  version = "1.0.12";
+
+  src = fetchFromGitHub {
+    repo = "simplefix";
+    owner = "da4089";
+    rev = "v${version}";
+    sha256 = "0pnyqxpki1ija0kha7axi6irgiifcz4w77libagkv46b1z11cc4r";
+  };
+
+  checkPhase = ''
+    cd test
+    ${python.interpreter} -m unittest all
+  '';
+
+  meta = with lib; {
+    description = "Simple FIX Protocol implementation for Python";
+    homepage = https://github.com/da4089/simplefix;
+    license = licenses.mit;
+    maintainers = with maintainers; [ catern ];
+  };
+}

pkgs/development/python-modules/stm32loader/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, progress
+, pyserial
+, pytest
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "stm32loader";
+  version = "0.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w6jg4dcyz6si6dcyx727sxi75wnl0j89xkiwqmsw286s1y8ijjw";
+  };
+
+  propagatedBuildInputs = [ progress pyserial ];
+
+  checkInputs = [ pytest ] ++ lib.optional isPy27 mock;
+
+  checkPhase = ''
+    pytest --strict tests/unit
+  '';
+
+  meta = with lib; {
+    description = "Flash firmware to STM32 microcontrollers in Python";
+    homepage = https://github.com/florisla/stm32loader;
+    changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ emily ];
+  };
+}

pkgs/development/python-modules/zeep/default.nix

@@ -18,7 +18,7 @@
 , freezegun
 , mock
 , pretend
-, pytest_3
+, pytest
 , pytestcov
 , requests-mock
 , aioresponses
@@ -54,12 +54,15 @@ buildPythonPackage rec {
     mock
     pretend
     pytestcov
-    pytest_3
+    pytest
     requests-mock
   ] ++ lib.optional isPy3k aioresponses;
 
   checkPhase = ''
     runHook preCheck
+    # fix compatibility with pytest 4
+    substituteInPlace tests/conftest.py \
+       --replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")'
     # ignored tests requires xmlsec python module
     HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py
     runHook postCheck

pkgs/development/python-modules/zetup/default.nix

@@ -1,14 +1,14 @@
 { stdenv, buildPythonPackage, fetchPypi
 , setuptools_scm, pathpy, nbconvert
-, pytest_3 }:
+, pytest }:
 
 buildPythonPackage rec {
   pname = "zetup";
-  version = "0.2.48";
+  version = "0.2.52";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "41af61e8e103656ee633f89ff67d6a94848b9b9a836d351bb813b87a139a7c46";
+    sha256 = "9ce97276acf0425499251c5eb700f6a3820adc52859df1e03c6d0f0b88a452cd";
   };
 
   # Python 3.7 compatibility
@@ -19,10 +19,10 @@ buildPythonPackage rec {
   '';
 
   checkPhase = ''
-    py.test test -k "not TestObject"
+    py.test test -k "not TestObject" --deselect=test/test_zetup_config.py::test_classifiers
   '';
 
-  checkInputs = [ pytest_3 pathpy nbconvert ];
+  checkInputs = [ pytest pathpy nbconvert ];
   propagatedBuildInputs = [ setuptools_scm ];
 
   meta = with stdenv.lib; {