Excluded folium 0.12.0 from requirements due to...

Excluded folium 0.12.0 from requirements due to https://github.com/python-visualization/folium/issues/1438

. Fixed incompletely deleted coverage artifacts after running 'make clean'. Updated version info.
Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

Makefile

@@ -46,6 +46,7 @@ clean-test: ## remove test and coverage artifacts
 	## don't call coverage erase here because make install calls make clean which calls make clean-test
 	## -> since make install should run without the test requirements we can't use coverage erase here
 	rm -fr .tox/
+	rm -f .coverage
 	rm -fr .coverage.*
 	rm -fr htmlcov/
 	rm -fr nosetests.html

arosics/version.py

@@ -22,5 +22,5 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-__version__ = '1.2.4'
-__versionalias__ = '2020-11-12_02'
+__version__ = '1.2.5'
+__versionalias__ = '2021-02-02_01'

docs/usage/input_data_requirements.rst

@@ -45,7 +45,7 @@ The input images may have different spatial resolutions. Any needed resampling o
 
 .. attention::
 
-    Please try avoid any spatial resampling of the input images before running AROSICS. It might affect
+    Please try to avoid any spatial resampling of the input images before running AROSICS. It might affect
     the accuracy of the computed misregistration.
 
 

requirements.txt

@@ -3,7 +3,7 @@ cmocean
 gdal
 geoarray>=0.9.0
 geojson
-folium>=0.6.0
+folium>=0.6.0,!=0.12.0
 geopandas
 matplotlib
 numpy

requirements_pip.txt

-folium>=0.6.0
+folium>=0.6.0,!=0.12.0
 geojson
 plotly
 six

setup.py

@@ -40,7 +40,7 @@ with open("arosics/version.py") as version_file:
 req = [
     'cartopy',
     'cmocean',
-    'folium>=0.6.0',
+    'folium>=0.6.0,!=0.12.0',
     'gdal',
     'geojson',
     'geoarray>=0.9.0',

tests/CI_docker/build_arosics_testsuite_image.sh

@@ -35,7 +35,7 @@ read -p "Please enter gitlab runner name: " runner_name
 echo "New gitlab runner image will named  ${gitlab_runner}"
 # NOTE: In case of locally stored images (like here), the docker pull policy 'never' must be used
 #       (see https://docs.gitlab.com/runner/executors/docker.html#how-pull-policies-work).
-docker exec -it ${gitlab_runner} /bin/bash -c "\
+docker exec -it ${gitlab_runner} /bin/bash -c    "\
 export RUNNER_EXECUTOR=docker && \
 gitlab-ci-multi-runner register \
   --non-interactive \

tests/CI_docker/context/environment_arosics.yml

@@ -23,7 +23,7 @@ dependencies:
   - shapely
 
   - pip:
-    - folium>=0.6.0
+    - folium>=0.6.0,!=0.12.0
     - geojson
     - plotly
     - six