Merge pull request #101958 from helsinki-systems/hass-nabucasa.0.37.1

python3Packages.hass-nabucasa: 0.34.0 -> 0.37.1
NixOS · Oct 28, 2020 · 7bbbc71 · 7bbbc71
2 parents caf6c6f + da2e834
commit 7bbbc71
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -4,38 +4,26 @@
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.34.6";
+  version = "0.37.1";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = pname;
     rev = version;
-    sha256 = "1lkqwj58qr0vn7zf5mhrhaz973ahj9wjp4mgzvyja1gcdh6amv34";
+    sha256 = "/GFNrLi1I69gUDIwnHa2q/pxkiRl9PKxpKtb56JrmuA=";
   };
 
   postPatch = ''
     sed -i 's/"acme.*"/"acme"/' setup.py
     sed -i 's/"cryptography.*"/"cryptography"/' setup.py
   '';
 
-  patches = [
-    # relax pytz dependency
-    (fetchpatch {
-      url = "https://github.com/NabuCasa/hass-nabucasa/commit/419e80feddc36c68384c032feda0057515b53eaa.patch";
-      sha256 = "14dgwci8615cwcf27hg7b42s7da50xhyjys3yx446q7ipk8zw4x6";
-    })
-  ];
-
   propagatedBuildInputs = [
     acme aiohttp atomicwrites snitun attrs warrant pycognito
   ];
 
   checkInputs = [ pytest pytest-aiohttp asynctest ];
 
-  # Asynctest's mocking is broken with python3.8
-  # https://github.com/Martiusweb/asynctest/issues/132
-  doCheck = pythonOlder "3.8";
-
   checkPhase = ''
     pytest tests/
   '';

diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "pycognito";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = "pycognito";
     rev = version;
-    sha256 = "0wy6d274xda7v6dazv10h2vwig2avfyz8mh2lpd1a5k7i06r335r";
+    sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w=";
   };
 
   postPatch = ''

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "python-jose";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "mpdavis";
     repo = "python-jose";
     rev = version;
-    sha256 = "1gnn0zy03pywj65ammy3sd07knzhjv8n5jhx1ir9bikgra9v0iqh";
+    sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY=";
   };
 
   checkInputs = [
@@ -23,6 +23,13 @@ buildPythonPackage rec {
     cryptography # optional dependency, but needed in tests
   ];
 
+  # relax ecdsa deps
+  patchPhase = ''
+    substituteInPlace setup.py \
+      --replace 'ecdsa<0.15' 'ecdsa' \
+      --replace 'ecdsa <0.15' 'ecdsa'
+  '';
+
   disabledTests = [
     # https://github.com/mpdavis/python-jose/issues/176
     "test_key_too_short"