Merge master into staging-next

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

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "nexia";
-  version = "0.9.7";
+  version = "0.9.8";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = pname;
     rev = version;
-    sha256 = "sha256-1oBrDr8QAUe6LLBliR/sNwDlLuisxOWPeI9sxuJtGxU=";
+    sha256 = "sha256-KjA3AnrMg4ySKSY2FDHVo0Zh9GoLUWiQDuUzo8d5At8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/requests-cache/default.nix

@@ -1,52 +1,57 @@
 { lib
-, buildPythonPackage
-, pythonOlder
-, fetchFromGitHub
 , attrs
+, buildPythonPackage
+, cattrs
+, fetchFromGitHub
 , itsdangerous
-, requests
-, url-normalize
+, poetry-core
 , pytestCheckHook
+, pythonOlder
+, pyyaml
+, requests
 , requests-mock
+, rich
 , timeout-decorator
+, ujson
+, url-normalize
 }:
 
 buildPythonPackage rec {
   pname = "requests-cache";
-  version = "0.6.4";
-
+  version = "0.7.0";
   disabled = pythonOlder "3.6";
-
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "reclosedev";
     repo = "requests-cache";
     rev = "v${version}";
-    sha256 = "10rvs611j16kakqx38kpqpc1v0dfb9rmbz2whpskswb1lsksv3j9";
+    sha256 = "sha256-P7JzImidUXOD4DUMdfy3sgM5RISti23wNnLwDHPoiTA=";
   };
 
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
   propagatedBuildInputs = [
     attrs
+    cattrs
     itsdangerous
+    pyyaml
     requests
+    ujson
     url-normalize
   ];
 
   checkInputs = [
     pytestCheckHook
     requests-mock
+    rich
     timeout-decorator
   ];
 
-  disabledTestPaths = [
-    # connect to database on localhost
-    "tests/integration/test_cache.py"
-    "tests/integration/test_dynamodb.py"
-    "tests/integration/test_gridfs.py"
-    "tests/integration/test_mongodb.py"
-    "tests/integration/test_redis.py"
-  ];
+  # Integration tests require local DBs
+  pytestFlagsArray = [ "tests/unit" ];
 
   pythonImportsCheck = [ "requests_cache" ];
 
@@ -54,5 +59,6 @@ buildPythonPackage rec {
     description = "Persistent cache for requests library";
     homepage = "https://github.com/reclosedev/requests-cache";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ fab ];
   };
 }

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

@@ -3,7 +3,6 @@
 , pythonOlder
 , fetchFromGitHub
 , poetry-core
-, fetchpatch
 , pytestCheckHook
 , pycodestyle
 , pyyaml
@@ -11,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tinydb";
-  version = "4.4.0";
+  version = "4.5.0";
   disabled = pythonOlder "3.5";
   format = "pyproject";
 
@@ -19,22 +18,13 @@ buildPythonPackage rec {
     owner = "msiemens";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-3FbsnLU7G4VVhI5NYRqCEQgo51zDeAkEhH69H52zr/w=";
+    sha256 = "sha256-rJVJfsPhGTQpE6p0kzN6GDR0r9M71ADa67Oi5jLgeWY=";
   };
 
   nativeBuildInputs = [
     poetry-core
   ];
 
-  patches = [
-    # Switch to poetry-core, https://github.com/msiemens/tinydb/pull/391
-    (fetchpatch {
-      name = "switch-to-peotry-core.patch";
-      url = "https://github.com/msiemens/tinydb/commit/5b547c18e7ce9f5925d5943dfa47d408435a0da5.patch";
-      sha256 = "19ma9ib020b82sn1mcr7sfysqbj8h6nbb365bih1x1wn3ym8xlbc";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pytest.ini \
       --replace "--cov-append --cov-report term --cov tinydb" ""

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

@@ -26,6 +26,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/dbr/tvdb_api";
     license = licenses.unlicense;
     maintainers = with maintainers; [ peterhoeg ];
+    # https://github.com/dbr/tvdb_api/issues/94
+    broken = true;
   };
-
 }