Merge 497d580 into 2d76651

.python-version

@@ -1 +1 @@
-3.6.4
+3.7.4

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.6"
+  - "3.7.4"
 
 script:
 - pytest

README.rst

@@ -43,7 +43,7 @@ How to use viroconcom
 ---------------------
 Requirements
 ~~~~~~~~~~~~
-Make sure you have installed Python `3.6.4`_ by typing
+Make sure you have installed Python `3.7.4`_ by typing
 
 .. code:: console
 

requirements.txt

@@ -10,14 +10,14 @@ docopt==0.6.2
 docutils==0.14
 idna==2.6
 imagesize==1.0.0
-Jinja2==2.10
+Jinja2==2.10.1
 kiwisolver==1.0.1
 MarkupSafe==1.0
 matplotlib==2.2.2
 more-itertools==4.1.0
-numpy==1.14.2
+numpy==1.17.4
 packaging==17.1
-pandas==0.22.0
+pandas==0.25.3
 patsy==0.5.0
 pluggy==0.6.0
 py==1.5.3
@@ -28,10 +28,10 @@ pytest-cov==2.5.1
 python-dateutil==2.7.0
 pytz==2018.3
 requests==2.18.4
-scipy==1.1.0
-six==1.11.0
+scipy==1.3.3
+six==1.12
 snowballstemmer==1.2.1
 Sphinx==1.7.1
 sphinxcontrib-websupport==1.0.1
-statsmodels==0.9.0
+statsmodels==0.10.2
 urllib3==1.22

viroconcom/contours.py

@@ -577,9 +577,9 @@ def cumsum_biggest_until(self, array, limit):
 
         summed_fields = np.zeros(array.shape)
 
-        summed_fields[np.unravel_index(summed_flat_inds, dims=array.shape)] = 1
+        summed_fields[np.unravel_index(summed_flat_inds, shape=array.shape)] = 1
 
-        last_summed = array[np.unravel_index(summed_flat_inds[-1], dims=array.shape)]
+        last_summed = array[np.unravel_index(summed_flat_inds[-1], shape=array.shape)]
 
 
         return summed_fields, last_summed

viroconcom/fitting.py

@@ -779,24 +779,21 @@ def _get_fitting_values(sample, samples, name, dependency, index,
                     multiple_basic_fit.append(basic_fit)
                     dist_values.append(samples_in_interval)
                 except ValueError:
-                    # For case that to few fitting data for the step were found
-                    # the step is deleted.
                     deleted_centers.append(i) # Add index of unused center.
                     warnings.warn(
-                        "There is not enough data for step '{}' in dimension "
-                        "'{}'. This step is skipped. Consider analyzing your "
-                        "data or reducing the number of intervals."
+                        "A ValueError occured for the interval centered at '{}'"
+                        " in dimension '{}'."
                             .format(step, dependency[index]),
                         RuntimeWarning, stacklevel=2)
             else:
-                # For case that to few fitting data for the step were found
+                # For case that too few fitting data for the step were found
                 # the step is deleted.
                 deleted_centers.append(i) # Add index of unused center.
                 warnings.warn(
                     "'Due to the restriction of MIN_DATA_POINTS_FOR_FIT='{}' "
                     "there is not enough data (n='{}') for the interval "
-                    "centered at '{}' in dimension '{}'. This step is skipped. "
-                    "Consider analyzing your data or reducing the number of "
+                    "centered at '{}' in dimension '{}'. No distribution will "
+                    "be fitted to this interval. Consider adjusting your "
                     "intervals."
                         .format(MIN_DATA_POINTS_FOR_FIT,
                         len(samples_in_interval),

viroconcom/version.py

@@ -1 +1 @@
-__version__ = '1.2.0'
+__version__ = '1.2.1'