Removed similarity module as this is only used by arosics (moved SSIM...

Removed similarity module as this is only used by arosics (moved SSIM computation there). Bumped version.

Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

HISTORY.rst

@@ -2,6 +2,12 @@
 History
 =======
 
+0.16.0 (2020-11-02)
+-------------------
+
+* Removed similarity module as this is only used by arosics (moved SSIM computation there).
+
+
 0.15.11 (2020-11-02)
 --------------------
 

py_tools_ds/similarity/__init__.py

-# -*- coding: utf-8 -*-
-
-# py_tools_ds
-#
-# Copyright (C) 2019  Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
-#
-# This software was developed within the context of the GeoMultiSens project funded
-# by the German Federal Ministry of Education and Research
-# (project grant code: 01 IS 14 010 A-C).
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-__author__ = "Daniel Scheffler"

py_tools_ds/similarity/raster.py

-# -*- coding: utf-8 -*-
-
-# py_tools_ds
-#
-# Copyright (C) 2019  Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
-#
-# This software was developed within the context of the GeoMultiSens project funded
-# by the German Federal Ministry of Education and Research
-# (project grant code: 01 IS 14 010 A-C).
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import numpy as np
-
-__author__ = "Daniel Scheffler"
-
-
-def calc_ssim(image0, image1, dynamic_range=None, win_size=None, gaussian_weights=False):
-    """Calculates Mean Structural Similarity Index between two images.
-
-    :param image0:
-    :param image1:
-    :param dynamic_range:
-    :param win_size:
-    :param gaussian_weights:
-    :return:
-    """
-    from skimage.metrics import structural_similarity as ssim  # import here to avoid static TLS import error
-
-    if image0.dtype != image1.dtype:
-        image0 = image0.astype(np.int16)
-        image1 = image1.astype(np.int16)
-
-    return ssim(image0, image1,
-                data_range=dynamic_range,
-                win_size=win_size,
-                gaussian_weights=gaussian_weights)

py_tools_ds/version.py

@@ -19,5 +19,5 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '0.15.11'
-__versionalias__ = '20201102_01'
+__version__ = '0.16.0'
+__versionalias__ = '20201102_02'

requirements.txt

 gdal
-kealib  # fix for libkea.so.1.4.7: cannot open shared object file: No such file or directory
 numpy
 shapely
 six
-scikit-image>=0.16.0
+scikit-image
 pandas
 geopandas
 pyproj>=2.1.0

setup.py

@@ -42,7 +42,7 @@ requirements = [
     'numpy',
     'pandas',
     'pyproj>=2.2.0',
-    'scikit-image>=0.16.0',
+    'scikit-image',
     'shapely',
     'six',
     'spectral'

tests/CI_docker/context/environment_py_tools_ds.yml

@@ -9,7 +9,7 @@ dependencies:
   - numpy
   - gdal>=2.1.0
   - pyproj>=2.2.0
-  - scikit-image>=0.16.0
+  - scikit-image
   - geopandas
   - pip:
     - sphinx-argparse