Merge master into staging-next

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

@@ -22,13 +22,13 @@
 
 buildPythonPackage rec {
   pname = "arviz";
-  version = "0.7.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "arviz-devs";
     repo = "arviz";
-    rev = version;
-    sha256 = "03hj7bkkj6kfqdk6ri2mp53wk4k7xpafxk01vgs6k9zg3rlnq7ny";
+    rev = "v${version}";
+    sha256 = "1cnj972knkvi084cfcpc12lv0wxm8xm9clfd55r3hvv42g1ms5d9";
   };
 
   propagatedBuildInputs = [

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

@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fx29gsa3glwh0ik5k2gynwdz6i3ckq9aakf6ip92n3qyh6l08a8";
+    sha256 = "1y04mchxybmy197lgj2rz53fx29s248hirsmb3zk2vdzlbbbs1b6";
   };
 
   sourceRoot = "source/${pname}";

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

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "118wp5sjsl99hj8pqw5n3v2lry9r949p2hv4l92p086q1n0axxk3";
+    sha256 = "0akkxcj11543c0jn4zdw4a668lk0xg7pghs8mch3xjk8nn8wfblc";
   };
 
   propagatedBuildInputs = [
@@ -26,13 +26,19 @@ buildPythonPackage rec {
       substituteInPlace $f --replace 'shell which' 'shell command -v'
     done
 
-    # This can probably be removed in the next update after 1.3.1
+    # This can perhaps be removed in the next update after 1.3.2?
     substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" ""
   '';
 
   checkInputs = [ swig verilog ];
 
   checkPhase = ''
+    # test expected failures actually pass because of a fix in our icarus version
+    # https://github.com/cocotb/cocotb/issues/1952
+    substituteInPlace tests/test_cases/test_discovery/test_discovery.py \
+      --replace 'def access_single_bit' $'def foo(x): pass\ndef foo' \
+      --replace 'def access_single_bit_assignment' $'def foo(x): pass\ndef foo'
+
     export PATH=$out/bin:$PATH
     make test
   '';

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

@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "django-anymail";
-  version = "6.1.0";
+  version = "8.1";
 
   src = fetchFromGitHub {
     owner = "anymail";
     repo = pname;
-    rev = "v6.1";
-    sha256 = "04jgz3qnsnba18rlqgxyb2g9128pk3ivflnj6695kibxg724fcpv";
+    rev = "v${version}";
+    sha256 = "1v8ayd3nh7pna9lg0pzwgwmvmzzh2g1kxsy7i6mka0hi52g1xvz5";
   };
 
   propagatedBuildInputs = [

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

@@ -0,0 +1,44 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pythonOlder
+, importlib-metadata
+, matplotlib
+, numpy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "dufte";
+  version = "0.2.9";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0nkaczipbsm8c14j9svxry2wigmn5iharibb6b8g062sjaph8x17";
+  };
+  format = "pyproject";
+
+  propagatedBuildInputs = [
+    matplotlib
+    numpy
+  ] ++ stdenv.lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+    mkdir -p $HOME/.matplotlib
+    echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
+  '';
+  checkInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "dufte" ];
+
+  meta = with stdenv.lib; {
+    description = "Clean matplotlib plots";
+    homepage = "https://github.com/nschloe/dufte";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ris ];
+  };
+}

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

@@ -4,6 +4,8 @@
 , google_api_core
 , pytest
 , mock
+, libcst
+, proto-plus
 }:
 
 buildPythonPackage rec {
@@ -16,7 +18,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core ];
+  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
 
   checkPhase = ''
     pytest tests/unit

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

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "itemadapter";
-  version = "0.1.0";
+  version = "0.1.1";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "52159b4f97d82aa2968000ee8371b2114af56a2f44e4cd9142580d46eea39020";
+    sha256 = "b5e75d48c769ee5c89de12aeba537b2d62d7b575cd549d5d430ed8a67faa63f2";
   };
 
   doCheck = false; # infinite recursion with Scrapy

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "itemloaders";
-  version = "1.0.1";
+  version = "1.0.3";
 
   disabled = isPy27;
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "scrapy";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0frs0s876ddha844vhnhhiggyk3qbhhngrwkvgg3c0mrnn282f6k";
+    sha256 = "1s8c2il7jyfixpb7h5zq0lf4s07pqwia4ycpf3slb8whcp0h8bfm";
   };
 
   propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ];

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

@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, typing-inspect
+, pyyaml
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "libcst";
+  version = "0.3.12";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zgwxdbhz2ljl0yzbrn1f4f464rjphx0j6r4qq0csax3m4wp50x1";
+  };
+
+  # The library uses type annotation syntax.
+  disabled = !isPy3k;
+
+  propagatedBuildInputs = [ typing-inspect pyyaml ];
+
+  # Test fails with ValueError: No data_provider tests were created for
+  # test_type_availability! Please double check your data.
+  # The tests appear to be doing some dynamic introspection, not sure what is
+  # going on there.
+  doCheck = false;
+  pythonImportsCheck = [ "libcst" ];
+
+  meta = with stdenv.lib; {
+    description = "A concrete syntax tree parser and serializer library for Python that preserves many aspects of Python's abstract syntax tree";
+    homepage = "https://libcst.readthedocs.io/en/latest/";
+    license = with licenses; [mit asl20 psfl];
+    maintainers = [ maintainers.ruuda ];
+  };
+}

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

@@ -1,30 +1,35 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, dufte
 , matplotlib
 , numpy
 , pipdate
 , tqdm
+, rich
 , pytest
 , isPy27
 }:
 
 buildPythonPackage rec {
   pname = "perfplot";
-  version = "0.5.0";
+  version = "0.8.4";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = "perfplot";
     rev = "v${version}";
-    sha256 = "16aj5ryjic1k3qn8xhpw6crczvxcs691vs5kv4pvb1zdx69g1xbv";
+    sha256 = "0avb0inx8qh8ss3j460v3z6mmn863hswa3bl19vkh475ndsjwmp0";
   };
+  format = "pyproject";
 
   propagatedBuildInputs = [
+    dufte
     matplotlib
     numpy
     pipdate
+    rich
     tqdm
   ];
 
@@ -33,7 +38,10 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-   HOME=$(mktemp -d) pytest test/perfplot_test.py
+    export HOME=$TMPDIR
+    mkdir -p $HOME/.matplotlib
+    echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
+    pytest test/perfplot_test.py
   '';
 
   meta = with lib; {

pkgs/development/python-modules/proto-plus/default.nix

@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, protobuf
+, google_api_core
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "proto-plus";
+  version = "1.10.1";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0n8ia51jg2dkab2sf0qnh39bssqhz65ybcqr78f3zzf7ja923lkr";
+  };
+
+  propagatedBuildInputs = [ protobuf ];
+
+  checkInputs = [ pytestCheckHook google_api_core ];
+
+  meta = with stdenv.lib; {
+    description = "Beautiful, idiomatic protocol buffers in Python";
+    homepage = "https://github.com/googleapis/proto-plus-python";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ruuda ];
+  };
+}

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

@@ -2,13 +2,13 @@
 
 python.pkgs.buildPythonPackage rec {
   pname = "pystemd";
-  version = "0.6.0";
+  version = "0.8.0";
   src = python.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "054a3ni71paqa1xa786840z3kjixcgyqdbscyq8nfxp3hwn0gz5i";
+    sha256 = "0wlrid2xd73dmzl4m0jgg6cqmkx3qs9v9nikvwxd8a5b8chf9hna";
   };
 
-  disabled = !python.pkgs.isPy3k;
+  disabled = python.pythonOlder "3.4";
 
   buildInputs = [ systemd ];
 

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

@@ -0,0 +1,46 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, CommonMark
+, colorama
+, dataclasses
+, ipywidgets
+, poetry
+, pygments
+, typing-extensions
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "rich";
+  version = "8.0.0";
+
+  # tests not included in pypi tarball
+  src = fetchFromGitHub {
+    owner = "willmcgugan";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0hv27b22x7dbx1i7nzsd8y8fymmvdak2hcx9242jwk4c1a7jr151";
+  };
+  format = "pyproject";
+
+  nativeBuildInputs = [ poetry ];
+  propagatedBuildInputs = [
+    CommonMark
+    colorama
+    ipywidgets
+    pygments
+    typing-extensions
+  ] ++ stdenv.lib.optional (pythonOlder "3.7") dataclasses;
+
+  checkInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "rich" ];
+
+  meta = with stdenv.lib; {
+    description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal";
+    homepage = "https://github.com/willmcgugan/rich";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ris ];
+  };
+}

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

@@ -3,7 +3,7 @@
 , isPy27
 , fetchPypi
 , glibcLocales
-, pytest
+, pytestCheckHook
 , testfixtures
 , pillow
 , twisted
@@ -18,7 +18,6 @@
 , cssselect
 , zope_interface
 , protego
-, lib
 , jmespath
 , sybil
 , pytest-twisted
@@ -28,7 +27,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.3.0";
+  version = "2.4.0";
   pname = "Scrapy";
 
   disabled = isPy27;
@@ -36,7 +35,7 @@ buildPythonPackage rec {
   checkInputs = [
     glibcLocales
     jmespath
-    pytest
+    pytestCheckHook
     sybil
     testfixtures
     pillow
@@ -63,19 +62,28 @@ buildPythonPackage rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  # Disable doctest plugin—enabled in the shipped pytest.ini—because it causes pytest to hang
-  # Ignore proxy tests because requires mitmproxy
-  # Ignore utils_display tests because it requires pygments
-  # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean"
-  # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396
-  checkPhase = ''
+  # Disable doctest plugin because it causes pytest to hang
+  preCheck = ''
     substituteInPlace pytest.ini --replace "--doctest-modules" ""
-    pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --ignore=tests/test_utils_display.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"}
   '';
 
+  pytestFlagsArray = [
+    "--ignore=tests/test_proxy_connect.py"
+    "--ignore=tests/test_utils_display.py"
+    "--ignore=tests/test_command_check.py"
+  ];
+
+  disabledTests = [
+    "FTPFeedStorageTest"
+    "test_noconnect"
+    "test_retry_dns_error"
+    "test_custom_asyncio_loop_enabled_true"
+    "test_custom_loop_asyncio"
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" ];
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b4d08cdacb615563c291d053ef1ba2dc08d9d4b6d81578684eaa1cf7b832f90c";
+    sha256 = "4ea7fbc902ee0b0a79b154d07a5f4e747e2146f272a748557941946000728479";
   };
 
   postInstall = ''
@@ -84,7 +92,7 @@ buildPythonPackage rec {
     install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
     homepage = "https://scrapy.org/";
     license = licenses.bsd3;

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

@@ -0,0 +1,37 @@
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "SwSpotify";
+  version = "1.2.1";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "SwagLyrics";
+    repo = "SwSpotify";
+    rev = "v${version}";
+    sha256 = "0jxcvy8lw8kpjbl4q6mi11164pvi0w9m9p76bxj2m7i7s5p4dxd4";
+  };
+
+  propagatedBuildInputs = [
+    requests flask-cors dbus-python
+  ];
+
+  preConfigure = ''
+    substituteInPlace setup.py \
+      --replace 'requests>=2.24.0' 'requests~=2.23'
+  '';
+
+  checkPhase = ''
+    pytest tests/test_spotify.py::LinuxTests
+  '';
+
+  checkInputs = [ pytestCheckHook mock ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/SwagLyrics/SwSpotify";
+    description = "Library to get the currently playing song and artist from Spotify";
+    license = licenses.mit;
+    maintainers = with maintainers; [ siraben ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/development/python-modules/wxPython/3.0.nix

@@ -37,10 +37,25 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ pkgconfig ]
     ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ])
-    ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]);
+    ++ (lib.optionals stdenv.isDarwin [ wxmac ]);
 
   buildInputs = [ ]
     ++ (lib.optionals (!stdenv.isDarwin) [  (wxGTK.gtk) ])
+    ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      ApplicationServices
+      AudioToolbox
+      CFNetwork
+      Carbon
+      Cocoa
+      CoreGraphics
+      CoreServices
+      CoreText
+      DiskArbitration
+      IOKit
+      ImageIO
+      OpenGL
+      Security
+    ]))
     ++ (lib.optional openglSupport pyopengl);
 
   preConfigure = ''