From f9ab0f25f8513b5b1cd782ff71bac45a530a713f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 2 Mar 2019 14:12:28 +0100
Subject: [PATCH] python.pkgs.tifffile: 2019.2.10 -> 2019.2.22 and fix build

---
 .../python-modules/tifffile/default.nix       | 31 ++++++++++---------
 .../tifffile/python2-regex-compat.patch       | 23 ++++++++++++++
 2 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/tifffile/python2-regex-compat.patch

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index f6af09c156c..9a0876548e5 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -1,31 +1,34 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder
-, numpy, nose, enum34, futures, pathlib }:
+{ lib, fetchPypi, buildPythonPackage, isPy27
+, numpy, enum34, futures, pathlib
+, pytest
+}:
 
 buildPythonPackage rec {
   pname = "tifffile";
-  # 2018.10.18 and 2018.11.6 are not releases...?
-  # https://github.com/blink1073/tifffile/issues/54
-  # anaconda uses 0.15.1
-  version = "2019.2.10";
+  version = "2019.2.22";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ead5f84c0b100f8100377b8ef2bcffaf21c249784ddc240346b715408b45f42c";
+    sha256 = "ed49d75b3eff711dbe74b35324dfd79e0db598b6e772a9096001545e81e95437";
   };
 
-  checkInputs = [ nose ];
+  patches = lib.optional isPy27 ./python2-regex-compat.patch;
+
+  # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles
+  # and test data missing from PyPI tarball
+  doCheck = false;
+  checkInputs = [ pytest ];
   checkPhase = ''
-    nosetests --exe -v --exclude="test_extension"
+    pytest
   '';
 
   propagatedBuildInputs = [ numpy ]
-    ++ lib.optional isPy27 [ futures pathlib ]
-    ++ lib.optional (pythonOlder "3.0") enum34;
+    ++ lib.optional isPy27 [ futures enum34 pathlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Read and write image data from and to TIFF files.";
-    homepage = https://github.com/blink1073/tifffile;
+    homepage = https://www.lfd.uci.edu/~gohlke/;
     maintainers = [ maintainers.lebastr ];
-    license = licenses.bsd2;
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch
new file mode 100644
index 00000000000..7f4ec5764bb
--- /dev/null
+++ b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch
@@ -0,0 +1,23 @@
+--- a/setup.py	2019-02-20 18:52:12.000000000 +0100
++++ b/setup.py	2019-03-02 13:55:39.014019260 +0100
+@@ -20,12 +20,6 @@
+ 
+ description = re.search(r'"""(.*)\.(?:\r\n|\r|\n)', code).groups()[0]
+ 
+-readme = re.search(r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}from', code,
+-                   re.MULTILINE | re.DOTALL).groups()[0]
+-
+-readme = '\n'.join([description, '=' * len(description)]
+-                   + readme.splitlines()[1:])
+-
+ license = re.search(r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', code,
+                     re.MULTILINE | re.DOTALL).groups()[0]
+ 
+@@ -41,7 +35,6 @@
+     name='tifffile',
+     version=version,
+     description=description,
+-    long_description=readme,
+     author='Christoph Gohlke',
+     author_email='cgohlke@uci.edu',
+     url='https://www.lfd.uci.edu/~gohlke/',