newsworthycharts 1.64.0__tar.gz → 1.65.0__tar.gz

{newsworthycharts-1.64.0/newsworthycharts.egg-info → newsworthycharts-1.65.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.64.0
+Version: 1.65.0
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.64.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -214,6 +214,10 @@ _ Inherits from Map _
 
 **ProgressChart**
 
+_ Inherits from CategoricalChart _
+
+- `target` = None  # A target value to compare to, often 1 (when using percentages)
+
 **RangePlot**
 
 **ScatterPlot**
@@ -255,6 +259,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.0
+
+  - Stacked data with percentages summing to very close to 100 % will now be treated as 100 %, assuming rounding error artifacts
+
+- 1.64.1
+
+  - Fixed assumption about y axis being the value axis in tick cleaning
+  - Fix floating point bug in label handling, causing some integer labels to disappear when decimals=0
+
 - 1.64.0
 
   - Improved handling of value axis in categorical charts

{newsworthycharts-1.64.0 → newsworthycharts-1.65.0}/README.rst

@@ -187,6 +187,10 @@ _ Inherits from Map _
 
 **ProgressChart**
 
+_ Inherits from CategoricalChart _
+
+- `target` = None  # A target value to compare to, often 1 (when using percentages)
+
 **RangePlot**
 
 **ScatterPlot**
@@ -228,6 +232,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.0
+
+  - Stacked data with percentages summing to very close to 100 % will now be treated as 100 %, assuming rounding error artifacts
+
+- 1.64.1
+
+  - Fixed assumption about y axis being the value axis in tick cleaning
+  - Fix floating point bug in label handling, causing some integer labels to disappear when decimals=0
+
 - 1.64.0
 
   - Improved handling of value axis in categorical charts

{newsworthycharts-1.64.0 → newsworthycharts-1.65.0}/newsworthycharts/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.64.0"
+__version__ = "1.65.0"
 
 from .chart import Chart
 from .choroplethmap import ChoroplethMap

{newsworthycharts-1.64.0 → newsworthycharts-1.65.0}/newsworthycharts/categoricalchart.py

@@ -20,6 +20,10 @@ class CategoricalChart(Chart):
         # Optional: specify a list of colors (for multiple datasets)
         self.colors = None
 
+    @property
+    def values_will_be_stacked(self):
+        return self.stacked
+
     def _add_pie_data(self):
         if len(self.data) > 1:
             raise ValueError("Pie chart takes one data series only.")

{newsworthycharts-1.64.0 → newsworthycharts-1.65.0}/newsworthycharts/chart.py

@@ -527,20 +527,21 @@ class Chart(object):
 
             ticks = self.value_axis.get_ticklabels()
             ticks_ = [x for (i, x) in enumerate(ticks) if ticks[i - 1].get_text() != x.get_text()]
+            value_axis = "_y" if self.value_axis == self.ax.yaxis else "_x"
             # remove non integer ticks
             if self.decimals == 0:
-                y = [float(x._y) for x in ticks]
+                y = [float(getattr(x, value_axis)) for x in ticks]
                 if self.units == "percent":
-                    y = [x for x in y if (x * 100).is_integer()]
+                    y = [x for x in y if round(x * 100, 5).is_integer()]
                 else:
-                    y = [x for x in y if x.is_integer()]
+                    y = [x for x in y if round(x, 5).is_integer()]
                 self.value_axis.set_ticks(y)
             # Remove duplicate y ticks (most should be gone as per above)
             elif len(ticks_) == 2 and self.data:
                 # When only two ticks we want them on top and bottom
-                self.value_axis.set_ticks([float(ticks[0]._y), self.data.max_val])
+                self.value_axis.set_ticks([float(getattr(ticks[0], value_axis)), self.data.max_val])
             elif len(ticks_) < len(ticks):
-                y = [float(x._y) for x in ticks_]
+                y = [float(getattr(x, value_axis)) for x in ticks_]
                 self.value_axis.set_ticks(y)
 
             # Force a second tick if we ended up having just one
@@ -549,6 +550,20 @@ class Chart(object):
             if len(ticks_) <= 1 and self.data:
                 self.value_axis.set_ticks([0, self.data.max_val])
 
+            # Special handling for stacked percents, where, we want to fix any rounding errors,
+            # to make sure value max is 100 %, and not something like 100.00000000000001 (which
+            # may cause an extra tick to show up
+            if self.units == "percent" and self.values_will_be_stacked:
+                max_val = max(self.data.stacked_values)
+                diff = abs(1 - max_val)
+                _decimals = self.decimals if self.decimals is not None else 2
+                if diff < (pow(10, -_decimals) / 100):  # 0.01 / 100 for 2 decimals, etc
+                    value_lim = self.ax.get_ylim() if value_axis == "_y" else self.ax.get_xlim()
+                    if value_axis == "_y":
+                        self.ax.set_ylim(value_lim[0], 1)
+                    else:
+                        self.ax.set_xlim(value_lim[0], 1)
+
         for a in self.annotations:
             self._annotate_point(a["text"], a["xy"], a["direction"])
         if self.ylabel is not None:
@@ -793,6 +808,15 @@ class Chart(object):
     def units(self):
         return self._units
 
+    @property
+    def values_will_be_stacked(self):
+        """
+            Are the values from more than one dataseries going to be stacked or grouped together,
+            e.g. a stacked barchart?
+            This is used to to sanitize the value axis, and work around rounding errors.
+        """
+        return False
+
     @units.setter
     def units(self, val: str):
         """ Units, used for number formatting. Note that 'degrees' is designed

{newsworthycharts-1.64.0 → newsworthycharts-1.65.0}/newsworthycharts/lib/datalist.py

@@ -184,6 +184,18 @@ class DataSet(MutableSequence):
             self.max_val = max(self.max_val, max(values))
         return v
 
+    @property
+    def values(self):
+        """ Return values from each data serie """
+        return [[to_float(x[1]) for x in s] for s in self.list]
+
+    @property
+    def stacked_values(self):
+        """Returns the sum of all y values in each x """
+        # converts None to np.na for np.sum()
+        values = array(self.values, dtype=float)
+        return np.nansum(values, axis=0).tolist()
+
     def __len__(self):
         return len(self.list)
 

{newsworthycharts-1.64.0 → newsworthycharts-1.65.0}/newsworthycharts/serialchart.py

@@ -143,6 +143,10 @@ class SerialChart(Chart):
             return "down"
         return "up"
 
+    @property
+    def values_will_be_stacked(self):
+        return (len(self.data) > 1) and all([t == "bars" for t in self.type])
+
     def _add_data(self):
 
         series = self.data
@@ -150,7 +154,6 @@ class SerialChart(Chart):
         # For backwards compatibility: Convert type = "line" -> type = ["line"]
         if type(self.type) is str:
             self.type = [self.type] * len(series)
-        is_stacked = (len(series) > 1) and all([t == "bars" for t in self.type])
 
         if self.allow_broken_y_axis is None:
             if "bars" in self.type:
@@ -323,7 +326,7 @@ class SerialChart(Chart):
                     hl_color_for_series = self._nwc_style["strong_color"]
                 elif i == 0:
                     base_color_for_series = self._nwc_style["strong_color"]
-                elif is_stacked:
+                elif self.values_will_be_stacked:
                     hl_color_for_series = self._nwc_style["strong_color"]
                     base_color_for_series = self._nwc_style["qualitative_colors"][i]
                 else:
@@ -370,7 +373,7 @@ class SerialChart(Chart):
                 #    bar_kwargs["edgecolor"] = "white"
                 #    bar_kwargs["linewidth"] = 0  # 1
 
-                if is_stacked and i > 0:
+                if self.values_will_be_stacked and i > 0:
                     if self.baseline != 0:
                         raise Exception("Setting a baseline is not supported for stacked bars")
                     # To make stacked bars we need to set bottom value
@@ -545,7 +548,7 @@ class SerialChart(Chart):
             ymax = self.ymax
             padding_top = 0
         else:
-            if is_stacked:
+            if self.values_will_be_stacked:
                 ymax = self.data.stacked_max_val
             else:
                 ymax = self.data.max_val + self.baseline

{newsworthycharts-1.64.0 → newsworthycharts-1.65.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.64.0
+Version: 1.65.0
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.64.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -214,6 +214,10 @@ _ Inherits from Map _
 
 **ProgressChart**
 
+_ Inherits from CategoricalChart _
+
+- `target` = None  # A target value to compare to, often 1 (when using percentages)
+
 **RangePlot**
 
 **ScatterPlot**
@@ -255,6 +259,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.0
+
+  - Stacked data with percentages summing to very close to 100 % will now be treated as 100 %, assuming rounding error artifacts
+
+- 1.64.1
+
+  - Fixed assumption about y axis being the value axis in tick cleaning
+  - Fix floating point bug in label handling, causing some integer labels to disappear when decimals=0
+
 - 1.64.0
 
   - Improved handling of value axis in categorical charts