Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 555fff97183e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce4b58f301b4
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 2, 2019

  1. python.pkgs.tifffile: 2019.2.10 -> 2019.2.22 and fix build 

    (cherry picked from commit f9ab0f2)
    Robert Schütz committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce4b58f View commit details
Showing with 40 additions and 14 deletions.
  1. +17 −14 pkgs/development/python-modules/tifffile/default.nix
  2. +23 −0 pkgs/development/python-modules/tifffile/python2-regex-compat.patch
31 changes: 17 additions & 14 deletions pkgs/development/python-modules/tifffile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
23 changes: 23 additions & 0 deletions pkgs/development/python-modules/tifffile/python2-regex-compat.patch
View file
Original file line number Diff line number Diff line change
@@ -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/',