Hello community,
here is the log from the commit of package python-imread for openSUSE:Factory checked in at 2019-05-22 15:41:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-imread (Old)
and /work/SRC/openSUSE:Factory/.python-imread.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-imread"
Wed May 22 15:41:30 2019 rev:2 rq:704732 version:0.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-imread/python-imread.changes 2018-05-11 14:28:47.578962966 +0200
+++ /work/SRC/openSUSE:Factory/.python-imread.new.5148/python-imread.changes 2019-05-22 15:42:12.858427008 +0200
@@ -1,0 +2,7 @@
+Wed May 22 10:57:59 UTC 2019 - pgajdos@suse.com
+
+- version update from 0.6.1 to 0.7.1
+ * Fix 16-bit RGB/RGBA TIFF write
+ * Support reading ImageJ ROIs
+
+-------------------------------------------------------------------
Old:
----
imread-0.6.1.tar.gz
New:
----
imread-0.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-imread.spec ++++++
--- /var/tmp/diff_new_pack.LLKtzm/_old 2019-05-22 15:42:14.158427003 +0200
+++ /var/tmp/diff_new_pack.LLKtzm/_new 2019-05-22 15:42:14.158427003 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-imread
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without test
Name: python-imread
-Version: 0.6.1
+Version: 0.7.1
Release: 0
Summary: Image reading library
License: MIT
@@ -37,9 +36,9 @@
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libwebp)
-%if %{with test}
+# SECTION test requirements
BuildRequires: %{python_module nose}
-%endif
+# /SECTION
BuildRequires: python-numpy
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%python_subpackages
@@ -67,10 +66,8 @@
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch}
-%if %{with test}
%check
%python_exec setup.py test
-%endif
%files %{python_files}
%defattr(-,root,root,-)
++++++ imread-0.6.1.tar.gz -> imread-0.7.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/ChangeLog new/imread-0.7.1/ChangeLog
--- old/imread-0.6.1/ChangeLog 2018-02-15 14:50:22.000000000 +0100
+++ new/imread-0.7.1/ChangeLog 2019-05-09 06:53:41.000000000 +0200
@@ -1,3 +1,9 @@
+Version 0.7.1 2019-05-09 by luispedro
+ * Fix 16-bit RGB/RGBA TIFF write (patch by Tomi Aarnio)
+
+Version 0.7.0 2018-09-30 by luispedro
+ * Support reading ImageJ ROIs
+
Version 0.6.1 2018-02-15 by luispedro
* Support pathlib paths as function arguments
* Fix 16 bit PNG write support (patch by Tomi Aarnio)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/PKG-INFO new/imread-0.7.1/PKG-INFO
--- old/imread-0.6.1/PKG-INFO 2018-02-15 18:24:28.000000000 +0100
+++ new/imread-0.7.1/PKG-INFO 2019-05-09 07:14:42.000000000 +0200
@@ -1,18 +1,26 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: imread
-Version: 0.6.1
+Version: 0.7.1
Summary: imread: Image reading library
Home-page: http://luispedro.org/software/imread
Author: Luis Pedro Coelho
Author-email: luis@luispedro.org
License: MIT
-Description-Content-Type: UNKNOWN
Description: ================================
mahotas-imread: Read Image Files
================================
- [](https://travis-ci.org/luispedro/imread)
- [](http://opensource.org/licenses/MIT)
+ .. image:: https://api.travis-ci.org/luispedro/imread.png
+ :target: https://travis-ci.org/luispedro/imread
+ .. image:: https://anaconda.org/conda-forge/imread/badges/license.svg
+ :target: http://opensource.org/licenses/MIT
+ .. image:: https://anaconda.org/conda-forge/imread/badges/installer/conda.svg
+ :target: https://anaconda.org/conda-forge/imread
+ .. image:: https://anaconda.org/conda-forge/imread/badges/downloads.svg
+ :target: https://anaconda.org/conda-forge/imread
+
+ IO with images and numpy arrays.
+
Mahotas-imread is a simple module with a small number of functions:
@@ -46,6 +54,12 @@
`Online documentation http://imread.rtfd.io/`__
+ Python versions 2.6, 2.7, 3.3+ are officially supported.
+
+ Python 3.2 (and earlier versions in the Python 3 series) are officially **not
+ supported**. Patches will be accepted if they do not mess up anything else, but
+ bug reports will not be considered as very high priority.
+
Citation
--------
@@ -123,20 +137,17 @@
https://twitter.com/luispedrocoelho`__ or `github
https://github.com/luispedro`__).
- Travis Build Status
- ~~~~~~~~~~~~~~~~~~~
-
- .. image:: https://travis-ci.org/luispedro/imread.png
- :target: https://travis-ci.org/luispedro/imread
+ History
+ ~~~~~~~
- Python versions 2.6, 2.7, 3.3+ are officially supported.
+ Version 0.7.1 (2019-05-09)
+ --------------------------
+ - Fix 16-bit RGB/RGBA TIFF write (patch by Tomi Aarnio)
- Python 3.2 (and earlier versions in the Python 3 series) are officially **not
- supported**. Patches will be accepted if they do not mess up anything else, but
- bug reports will not be considered as very high priority.
+ Version 0.7.0 (2018-09-30)
+ --------------------------
+ - Add support for reading ImageJ ROIs
- History
- ~~~~~~~
Version 0.6.1 (2018-02-15)
--------------------------
@@ -255,6 +266,14 @@
Classifier: Topic :: Scientific/Engineering :: Image Recognition
Classifier: Topic :: Software Development :: Libraries
Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: C++
Classifier: License :: OSI Approved :: MIT License
+Description-Content-Type: text/x-rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/README.rst new/imread-0.7.1/README.rst
--- old/imread-0.6.1/README.rst 2018-02-15 14:50:33.000000000 +0100
+++ new/imread-0.7.1/README.rst 2019-05-09 07:00:05.000000000 +0200
@@ -2,8 +2,17 @@
mahotas-imread: Read Image Files
================================
-[](https://travis-ci.org/luispedro/imread)
-[](http://opensource.org/licenses/MIT)
+.. image:: https://api.travis-ci.org/luispedro/imread.png
+ :target: https://travis-ci.org/luispedro/imread
+.. image:: https://anaconda.org/conda-forge/imread/badges/license.svg
+ :target: http://opensource.org/licenses/MIT
+.. image:: https://anaconda.org/conda-forge/imread/badges/installer/conda.svg
+ :target: https://anaconda.org/conda-forge/imread
+.. image:: https://anaconda.org/conda-forge/imread/badges/downloads.svg
+ :target: https://anaconda.org/conda-forge/imread
+
+IO with images and numpy arrays.
+
Mahotas-imread is a simple module with a small number of functions:
@@ -37,6 +46,12 @@
`Online documentation http://imread.rtfd.io/`__
+Python versions 2.6, 2.7, 3.3+ are officially supported.
+
+Python 3.2 (and earlier versions in the Python 3 series) are officially **not
+supported**. Patches will be accepted if they do not mess up anything else, but
+bug reports will not be considered as very high priority.
+
Citation
--------
@@ -114,20 +129,17 @@
https://twitter.com/luispedrocoelho`__ or `github
https://github.com/luispedro`__).
-Travis Build Status
-~~~~~~~~~~~~~~~~~~~
-
-.. image:: https://travis-ci.org/luispedro/imread.png
- :target: https://travis-ci.org/luispedro/imread
+History
+~~~~~~~
-Python versions 2.6, 2.7, 3.3+ are officially supported.
+Version 0.7.1 (2019-05-09)
+--------------------------
+- Fix 16-bit RGB/RGBA TIFF write (patch by Tomi Aarnio)
-Python 3.2 (and earlier versions in the Python 3 series) are officially **not
-supported**. Patches will be accepted if they do not mess up anything else, but
-bug reports will not be considered as very high priority.
+Version 0.7.0 (2018-09-30)
+--------------------------
+- Add support for reading ImageJ ROIs
-History
-~~~~~~~
Version 0.6.1 (2018-02-15)
--------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/docs/source/history.rst new/imread-0.7.1/docs/source/history.rst
--- old/imread-0.6.1/docs/source/history.rst 2018-02-15 14:50:33.000000000 +0100
+++ new/imread-0.7.1/docs/source/history.rst 2019-05-09 06:54:29.000000000 +0200
@@ -2,6 +2,14 @@
History
=======
+Version 0.7.1 (2019-05-09)
+--------------------------
+- Fix 16-bit RGB/RGBA TIFF write (patch by Tomi Aarnio)
+
+Version 0.7.0 (2018-09-30)
+--------------------------
+- Add support for reading ImageJ ROIs
+
Version 0.6.1 (2018-02-15)
--------------------------
- Support pathlib paths as function arguments
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/imread/ijrois.py new/imread-0.7.1/imread/ijrois.py
--- old/imread-0.6.1/imread/ijrois.py 1970-01-01 01:00:00.000000000 +0100
+++ new/imread-0.7.1/imread/ijrois.py 2018-09-22 13:37:14.000000000 +0200
@@ -0,0 +1,132 @@
+# Copyright: Luis Pedro Coelho , 2012-2018
+# License: MIT
+import numpy as np
+
+def read_roi(fileobj):
+ '''
+ points = read_roi(fileobj)
+
+ Read ImageJ's ROI format
+
+ Parameters
+ ----------
+ fileobj: should be a file-like object
+
+ Returns
+ -------
+
+ points: a list of points
+ '''
+# This is based on:
+# http://rsbweb.nih.gov/ij/developer/source/ij/io/RoiDecoder.java.html
+# http://rsbweb.nih.gov/ij/developer/source/ij/io/RoiEncoder.java.html
+
+
+ SPLINE_FIT = 1
+ DOUBLE_HEADED = 2
+ OUTLINE = 4
+ OVERLAY_LABELS = 8
+ OVERLAY_NAMES = 16
+ OVERLAY_BACKGROUNDS = 32
+ OVERLAY_BOLD = 64
+ SUB_PIXEL_RESOLUTION = 128
+ DRAW_OFFSET = 256
+
+
+ pos = [4]
+ def get8():
+ pos[0] += 1
+ s = fileobj.read(1)
+ if not s:
+ raise IOError('readroi: Unexpected EOF')
+ return ord(s)
+
+ def get16():
+ b0 = get8()
+ b1 = get8()
+ return (b0 << 8) | b1
+
+ def get32():
+ s0 = get16()
+ s1 = get16()
+ return (s0 << 16) | s1
+
+ def getfloat():
+ v = np.int32(get32())
+ return v.view(np.float32)
+
+ magic = fileobj.read(4)
+ if magic != b'Iout':
+ raise IOError('Magic number not found')
+ version = get16()
+
+ # It seems that the roi type field occupies 2 Bytes, but only one is used
+ roi_type = get8()
+ # Discard second Byte:
+ get8()
+
+ if not (0 <= roi_type < 11):
+ raise ValueError('roireader: ROI type %s not supported' % roi_type)
+
+ if roi_type != 7:
+ raise ValueError('roireader: ROI type %s not supported (!= 7)' % roi_type)
+
+ top = get16()
+ left = get16()
+ bottom = get16()
+ right = get16()
+ n_coordinates = get16()
+
+ x1 = getfloat()
+ y1 = getfloat()
+ x2 = getfloat()
+ y2 = getfloat()
+ stroke_width = get16()
+ shape_roi_size = get32()
+ stroke_color = get32()
+ fill_color = get32()
+ subtype = get16()
+ if subtype != 0:
+ raise ValueError('roireader: ROI subtype {} not supported (!= 0)'.format(subtype))
+ options = get16()
+ arrow_style = get8()
+ arrow_head_size = get8()
+ rect_arc_size = get16()
+ position = get32()
+ header2offset = get32()
+
+ if options & SUB_PIXEL_RESOLUTION:
+ getc = getfloat
+ points = np.empty((n_coordinates, 2), dtype=np.float32)
+ else:
+ getc = get16
+ points = np.empty((n_coordinates, 2), dtype=np.int16)
+ points[:,1] = [getc() for i in range(n_coordinates)]
+ points[:,0] = [getc() for i in range(n_coordinates)]
+ points[:,1] += left
+ points[:,0] += top
+ points -= 1
+ return points
+
+def read_roi_zip(fname):
+ '''
+ Reads all ROIs in a ZIP file
+
+ Parameters
+ ----------
+ fname : str
+ Input filename
+
+ Returns
+ -------
+ rois: list of ROIs
+ Each ROI is a vector of 2D points
+
+ See Also
+ --------
+ read_roi: function, reads a single ROI
+ '''
+ import zipfile
+ with zipfile.ZipFile(fname) as zf:
+ return [read_roi(zf.open(n))
+ for n in zf.namelist()]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/imread/imread_version.py new/imread-0.7.1/imread/imread_version.py
--- old/imread-0.6.1/imread/imread_version.py 2018-02-15 14:49:56.000000000 +0100
+++ new/imread-0.7.1/imread/imread_version.py 2019-05-09 06:53:57.000000000 +0200
@@ -1 +1 @@
-__version__ = '0.6.1'
+__version__ = '0.7.1'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/imread/lib/_tiff.cpp new/imread-0.7.1/imread/lib/_tiff.cpp
--- old/imread-0.6.1/imread/lib/_tiff.cpp 2016-03-14 00:30:38.000000000 +0100
+++ new/imread-0.7.1/imread/lib/_tiff.cpp 2019-05-09 06:52:45.000000000 +0200
@@ -316,6 +316,7 @@
void* bufp = 0;
bool copy_data = false;
const uint32 h = im->dim(0);
+ const uint32 nchannels = uint16(im->dim_or(2, 1));
const uint16 photometric = ((im->ndims() == 3 && im->dim(2)) ?
PHOTOMETRIC_RGB :
PHOTOMETRIC_MINISBLACK);
@@ -336,7 +337,7 @@
if (get_optional_bool(opts, "tiff:horizontal-predictor", prediction_default)) {
TIFFSetField(t.tif, TIFFTAG_PREDICTOR, PREDICTOR_HORIZONTAL);
if (!copy_data) {
- bufdata.resize(im->dim(1) * im->nbytes());
+ bufdata.resize(im->dim(1) * im->nbytes() * nchannels);
bufp = &bufdata[0];
copy_data = true;
}
@@ -385,7 +386,7 @@
for (uint32 r = 0; r != h; ++r) {
void* rowp = im->rowp(r);
if (copy_data) {
- std::memcpy(bufp, rowp, im->dim(1) * im->nbytes());
+ std::memcpy(bufp, rowp, im->dim(1) * im->nbytes() * nchannels);
rowp = bufp;
}
if (TIFFWriteScanline(t.tif, rowp, r) == -1) {
@@ -400,4 +401,3 @@
}
TIFFFlush(t.tif);
}
-
Binary files old/imread-0.6.1/imread/tests/data/0186-0099.roi and new/imread-0.7.1/imread/tests/data/0186-0099.roi differ
Binary files old/imread-0.6.1/imread/tests/data/rois.zip and new/imread-0.7.1/imread/tests/data/rois.zip differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/imread/tests/test_rois.py new/imread-0.7.1/imread/tests/test_rois.py
--- old/imread-0.6.1/imread/tests/test_rois.py 1970-01-01 01:00:00.000000000 +0100
+++ new/imread-0.7.1/imread/tests/test_rois.py 2018-09-22 13:44:02.000000000 +0200
@@ -0,0 +1,11 @@
+import numpy as np
+from imread import ijrois
+
+from . import file_path
+
+
+def test_rois_smoke():
+ rois = ijrois.read_roi_zip('./imread/tests/data/rois.zip')
+ assert len(rois) == 4
+ r = ijrois.read_roi(open('./imread/tests/data/0186-0099.roi', 'rb'))
+ assert any([np.array_equal(ri, r) for ri in rois])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/imread/tests/test_tiff.py new/imread-0.7.1/imread/tests/test_tiff.py
--- old/imread-0.6.1/imread/tests/test_tiff.py 2016-03-14 00:30:38.000000000 +0100
+++ new/imread-0.7.1/imread/tests/test_tiff.py 2019-05-03 17:35:10.000000000 +0200
@@ -67,6 +67,15 @@
assert np.all(im == im2)
@with_setup(teardown=_remove_file)
+def test_read_back_colour_16bit():
+ im = np.random.random((16,8,3)) * 65535.0
+ im = im.astype(np.uint16)
+ imsave(_filename, im)
+ im2 = imread(_filename)
+ assert im.shape == im2.shape
+ assert np.all(im == im2)
+
+@with_setup(teardown=_remove_file)
def test_horizontal_predictor():
im = imread(file_path('arange512_16bit.png'))
im2 = im.copy()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/imread.egg-info/PKG-INFO new/imread-0.7.1/imread.egg-info/PKG-INFO
--- old/imread-0.6.1/imread.egg-info/PKG-INFO 2018-02-15 18:24:28.000000000 +0100
+++ new/imread-0.7.1/imread.egg-info/PKG-INFO 2019-05-09 07:14:42.000000000 +0200
@@ -1,18 +1,26 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: imread
-Version: 0.6.1
+Version: 0.7.1
Summary: imread: Image reading library
Home-page: http://luispedro.org/software/imread
Author: Luis Pedro Coelho
Author-email: luis@luispedro.org
License: MIT
-Description-Content-Type: UNKNOWN
Description: ================================
mahotas-imread: Read Image Files
================================
- [](https://travis-ci.org/luispedro/imread)
- [](http://opensource.org/licenses/MIT)
+ .. image:: https://api.travis-ci.org/luispedro/imread.png
+ :target: https://travis-ci.org/luispedro/imread
+ .. image:: https://anaconda.org/conda-forge/imread/badges/license.svg
+ :target: http://opensource.org/licenses/MIT
+ .. image:: https://anaconda.org/conda-forge/imread/badges/installer/conda.svg
+ :target: https://anaconda.org/conda-forge/imread
+ .. image:: https://anaconda.org/conda-forge/imread/badges/downloads.svg
+ :target: https://anaconda.org/conda-forge/imread
+
+ IO with images and numpy arrays.
+
Mahotas-imread is a simple module with a small number of functions:
@@ -46,6 +54,12 @@
`Online documentation http://imread.rtfd.io/`__
+ Python versions 2.6, 2.7, 3.3+ are officially supported.
+
+ Python 3.2 (and earlier versions in the Python 3 series) are officially **not
+ supported**. Patches will be accepted if they do not mess up anything else, but
+ bug reports will not be considered as very high priority.
+
Citation
--------
@@ -123,20 +137,17 @@
https://twitter.com/luispedrocoelho`__ or `github
https://github.com/luispedro`__).
- Travis Build Status
- ~~~~~~~~~~~~~~~~~~~
-
- .. image:: https://travis-ci.org/luispedro/imread.png
- :target: https://travis-ci.org/luispedro/imread
+ History
+ ~~~~~~~
- Python versions 2.6, 2.7, 3.3+ are officially supported.
+ Version 0.7.1 (2019-05-09)
+ --------------------------
+ - Fix 16-bit RGB/RGBA TIFF write (patch by Tomi Aarnio)
- Python 3.2 (and earlier versions in the Python 3 series) are officially **not
- supported**. Patches will be accepted if they do not mess up anything else, but
- bug reports will not be considered as very high priority.
+ Version 0.7.0 (2018-09-30)
+ --------------------------
+ - Add support for reading ImageJ ROIs
- History
- ~~~~~~~
Version 0.6.1 (2018-02-15)
--------------------------
@@ -255,6 +266,14 @@
Classifier: Topic :: Scientific/Engineering :: Image Recognition
Classifier: Topic :: Software Development :: Libraries
Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: C++
Classifier: License :: OSI Approved :: MIT License
+Description-Content-Type: text/x-rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/imread.egg-info/SOURCES.txt new/imread-0.7.1/imread.egg-info/SOURCES.txt
--- old/imread-0.6.1/imread.egg-info/SOURCES.txt 2018-02-15 18:24:28.000000000 +0100
+++ new/imread-0.7.1/imread.egg-info/SOURCES.txt 2019-05-09 07:14:42.000000000 +0200
@@ -11,6 +11,7 @@
docs/source/readme.rst
imread/__init__.py
imread/_imread.cpp
+imread/ijrois.py
imread/imread.py
imread/imread_version.py
imread/special.py
@@ -50,9 +51,11 @@
imread/tests/test_imsave.py
imread/tests/test_jpeg.py
imread/tests/test_png.py
+imread/tests/test_rois.py
imread/tests/test_tiff.py
imread/tests/test_webp.py
imread/tests/test_xcf.py
+imread/tests/data/0186-0099.roi
imread/tests/data/1_webp_a.webp
imread/tests/data/GOOD.PNG
imread/tests/data/arange512_16bit.png
@@ -70,5 +73,6 @@
imread/tests/data/palette_zero.png
imread/tests/data/py-installer-indexed.bmp
imread/tests/data/rgba.png
+imread/tests/data/rois.zip
imread/tests/data/stack.tiff
imread/tests/data/star1.bmp
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imread-0.6.1/setup.py new/imread-0.7.1/setup.py
--- old/imread-0.6.1/setup.py 2017-06-17 11:34:19.000000000 +0200
+++ new/imread-0.7.1/setup.py 2019-05-09 06:59:09.000000000 +0200
@@ -4,6 +4,7 @@
# License: MIT
from __future__ import division, print_function
+import platform
import sys
try:
@@ -84,6 +85,11 @@
extensions['imread._imread'].append('imread/lib/_webp.cpp')
libraries.append('webp')
+extra_args = []
+if platform.platform().startswith('Darwin'):
+ if int(platform.mac_ver()[0].split('.')[1]) >= 9:
+ extra_args.append('-stdlib=libc++')
+
ext_modules = [
setuptools.Extension(
key,
@@ -93,6 +99,8 @@
sources=sources,
undef_macros=undef_macros,
define_macros=define_macros,
+ extra_compile_args=extra_args,
+ extra_link_args=extra_args,
) for key, sources in extensions.items()]
packages = setuptools.find_packages()
@@ -112,7 +120,14 @@
'Topic :: Scientific/Engineering :: Image Recognition',
'Topic :: Software Development :: Libraries',
'Programming Language :: Python',
+'Programming Language :: Python :: 2',
+'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
+'Programming Language :: Python :: 3.3',
+'Programming Language :: Python :: 3.4',
+'Programming Language :: Python :: 3.5',
+'Programming Language :: Python :: 3.6',
+'Programming Language :: Python :: 3.7',
'Programming Language :: C++',
'License :: OSI Approved :: MIT License',
]
@@ -121,6 +136,7 @@
version = __version__,
description = 'imread: Image reading library',
long_description = long_description,
+ long_description_content_type = 'text/x-rst',
author = 'Luis Pedro Coelho',
author_email = 'luis@luispedro.org',
license = 'MIT',
