newsworthycharts 1.64.1__tar.gz → 1.65.1__tar.gz

{newsworthycharts-1.64.1/newsworthycharts.egg-info → newsworthycharts-1.65.1}/PKG-INFO

@@ -1,29 +1,15 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.64.1
+Version: 1.65.1
 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.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.1.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.9.2
-Requires-Dist: langcodes>=3.3
-Requires-Dist: Babel<3,>=2.14.0
-Requires-Dist: PyYAML>=3
-Requires-Dist: adjustText==0.7.3
-Requires-Dist: numpy>2
-Requires-Dist: python-dateutil<3,>=2
-Requires-Dist: Pillow==11.0.0
-Requires-Dist: requests>=2.22
-Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas>=1
-Requires-Dist: mapclassify==2.8.1
-Requires-Dist: puremagic>=1
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -259,6 +245,14 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.1
+
+  - Fixed legend bug in ProgressChart
+
+- 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

{newsworthycharts-1.64.1 → newsworthycharts-1.65.1}/README.rst

@@ -232,6 +232,14 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.1
+
+  - Fixed legend bug in ProgressChart
+
+- 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

{newsworthycharts-1.64.1 → newsworthycharts-1.65.1}/newsworthycharts/__init__.py

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

{newsworthycharts-1.64.1 → newsworthycharts-1.65.1}/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.")
@@ -288,13 +292,13 @@ class ProgressChart(CategoricalChart):
     def __init__(self, *args, **kwargs):
         self.target = None
         self.target_label = None
-        self.legend = False
 
         # should value labels be rendered?
         self.value_labels = None  # "progress"|"remaining"
 
         super().__init__(*args, **kwargs)
         self.stacked = True
+        self.legend = False
 
     def _add_data(self):
         if self.target is None:
@@ -335,7 +339,7 @@ class ProgressChart(CategoricalChart):
 
             # rect.set_linewidth(1)
             # rect.set_edgecolor(color_progress)
-
+        
         # LABELING: Target
         if self.target_label:
             offset = 25

{newsworthycharts-1.64.1 → newsworthycharts-1.65.1}/newsworthycharts/chart.py

@@ -550,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:
@@ -794,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.1 → newsworthycharts-1.65.1}/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.1 → newsworthycharts-1.65.1}/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.65.1/newsworthycharts/translations/.~lock.datawrapper_regions.csv#

@@ -0,0 +1 @@
+,jens,jens-XPS-13,10.02.2020 11:26,file:///home/jens/.config/libreoffice/4;

{newsworthycharts-1.64.1 → newsworthycharts-1.65.1/newsworthycharts.egg-info}/PKG-INFO

@@ -1,29 +1,15 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.64.1
+Version: 1.65.1
 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.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.1.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.9.2
-Requires-Dist: langcodes>=3.3
-Requires-Dist: Babel<3,>=2.14.0
-Requires-Dist: PyYAML>=3
-Requires-Dist: adjustText==0.7.3
-Requires-Dist: numpy>2
-Requires-Dist: python-dateutil<3,>=2
-Requires-Dist: Pillow==11.0.0
-Requires-Dist: requests>=2.22
-Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas>=1
-Requires-Dist: mapclassify==2.8.1
-Requires-Dist: puremagic>=1
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -259,6 +245,14 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.1
+
+  - Fixed legend bug in ProgressChart
+
+- 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

{newsworthycharts-1.64.1 → newsworthycharts-1.65.1}/newsworthycharts.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ newsworthycharts/lib/utils.py
 newsworthycharts/maps/se-4.gpkg
 newsworthycharts/maps/se-7.gpkg
 newsworthycharts/rc/newsworthy
+newsworthycharts/translations/.~lock.datawrapper_regions.csv#
 newsworthycharts/translations/datawrapper_regions.csv
 newsworthycharts/translations/regions.py
 newsworthycharts/translations/se_municipalities.csv

{newsworthycharts-1.64.1 → newsworthycharts-1.65.1}/test/test_categorical_chart.py

@@ -338,3 +338,23 @@ def test_progress_chart_with_multiple_targets():
     c = ProgressChart.init_from(chart_obj, storage=local_storage)
 
     c.render("progress_chart_with_multiple_targets", "png")
+
+def test_basic_progress_chart():
+    chart_obj = {
+        "data": [
+            [
+                ("A", .9404),
+                ("B", .8868),
+                ("C", .8260),
+            ],
+        ],
+        "target": 1,
+        "value_labels": "progress",
+        "width": 700,
+        "height": 400,
+        "units": "percent",
+        "bar_orientation": "horizontal",
+        "title": "Inga mål uppnås"
+    }
+    c = ProgressChart.init_from(chart_obj, storage=local_storage)
+    c.render("progress_chart_basic", "png")