From 766f0d0a607d63ed15a7f53196f54e49c80bf559 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 7 Sep 2019 14:54:16 +0300
Subject: pythonPackages.can: 3.1.0 -> 3.3.1

---
 pkgs/development/python-modules/can/default.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index 8e6c90441211..b87e526dc452 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -1,7 +1,9 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , pythonOlder
+, isPy27
+, aenum
 , wrapt
 , typing
 , pyserial
@@ -14,21 +16,21 @@
 
 buildPythonPackage rec {
   pname = "python-can";
-  version = "3.1.0";
+  version = "3.3.1";
 
-  # PyPI tarball is missing some tests and is missing __init__.py in test
-  # directory causing the tests to fail. See:
-  # https://github.com/hardbyte/python-can/issues/518
-  src = fetchFromGitHub {
-    repo = pname;
-    owner = "hardbyte";
-    rev = "v${version}";
-    sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1giv9s6w90lalxsijgnxzynygkckcfyaxnxsldbwv0784vwy1jcd";
   };
 
-  propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing;
+  propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
   checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];
 
+  # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
+  # that case. This clause can be removed once hypothesis has been upgraded in
+  # nixpkgs.
+  doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
+
   # Add the scripts to PATH
   checkPhase = ''
     PATH=$out/bin:$PATH pytest -c /dev/null
-- 
cgit 1.4.1