newsworthycharts 1.63.4__py3-none-any.whl → 1.64.0__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/categoricalchart.py

@@ -15,11 +15,43 @@ class CategoricalChart(Chart):
         self.annotation_rotation = 0
         self.stacked = False
         self.legend = True
+        self.type = "bars"
 
         # Optional: specify a list of colors (for multiple datasets)
         self.colors = None
 
+    def _add_pie_data(self):
+        if len(self.data) > 1:
+            raise ValueError("Pie chart takes one data series only.")
+        self.legend = False
+        self.show_ticks = False
+
+        data = self.data[0]
+        values = [to_float(x[1]) for x in data]
+        labels = [x[0] for x in data]
+
+        if self.colors is not None:
+            colors = self.colors
+        else:
+            colors = [self._nwc_style["qualitative_colors"][i] for i in range(len(values))]
+
+        explode = [0.1 if x == self.highlight else 0 for x in labels]
+
+        self.ax.pie(
+            values,
+            labels=labels,
+            startangle=90,
+            colors=colors,
+            explode=explode
+        )
+        self.ax.axis('equal')
+
+        self._setup_legend()
+
     def _add_data(self):
+        if self.type == "pie":
+            self._add_pie_data()
+            return
         allowed_orientations = ["horizontal", "vertical"]
         if self.bar_orientation not in allowed_orientations:
             raise ValueError(f"Valid oriantations: {allowed_orientations}")

newsworthycharts/chart.py

@@ -138,10 +138,12 @@ class Chart(object):
         return self._get_formatter(self.units)
 
     def _get_formatter(self, units):
-        formatter = Formatter(self._language,
-                              decimals=self.decimals,
-                              force_decimals=self.force_decimals,
-                              scale="celsius")
+        formatter = Formatter(
+            self._language,
+            decimals=self.decimals,
+            force_decimals=self.force_decimals,
+            scale="celsius",
+        )
         if units == "percent":
             return FuncFormatter(formatter.percent)
         elif units == "degrees":
@@ -396,7 +398,7 @@ class Chart(object):
                 d = num2date(x).isoformat()[:10]
                 # 9 years later
                 d2 = str(int(d[:4]) + 9) + d[4:]
-                if len(self.data.x_points) > 7:
+                if len(self.data.x_points) > 5:
                     return formatter.date(d, "yy") + "–" + formatter.date(d2, "yy")
                 else:
                     return formatter.date(d, "y") + "–" + formatter.date(d2, "yy")
@@ -522,25 +524,30 @@ class Chart(object):
                             if try_dec > 2:
                                 keep_trying = False
                             try_dec += 1
-            # Remove duplicate y ticks (most should be gone as per above)
+
             ticks = self.value_axis.get_ticklabels()
             ticks_ = [x for (i, x) in enumerate(ticks) if ticks[i - 1].get_text() != x.get_text()]
-            if len(ticks_) < len(ticks):
-                y = [float(x._y) for x in ticks_]
-                if self.decimals == 0:
-                    # Recrate with integres
-                    import math
-                    _bottom = min(y)
-                    _top = math.ceil(max(y))
-                    _bottom, _top = int(_bottom), int(_top)
-                    y = range(_bottom, _top + 1)
-                    y = [float(x) for x in y]
-                self.value_axis.set_ticks(y)
+            # remove non integer ticks
             if self.decimals == 0:
-                # remove non integer ticks
                 y = [float(x._y) for x in ticks]
-                y = [x for x in y if x.is_integer()]
+                if self.units == "percent":
+                    y = [x for x in y if (x * 100).is_integer()]
+                else:
+                    y = [x for x in y if x.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])
+            elif len(ticks_) < len(ticks):
+                y = [float(x._y) for x in ticks_]
+                self.value_axis.set_ticks(y)
+
+            # Force a second tick if we ended up having just one
+            ticks = self.value_axis.get_ticklabels()
+            ticks_ = [x for (i, x) in enumerate(ticks) if ticks[i - 1].get_text() != x.get_text()]
+            if len(ticks_) <= 1 and self.data:
+                self.value_axis.set_ticks([0, self.data.max_val])
 
         for a in self.annotations:
             self._annotate_point(a["text"], a["xy"], a["direction"])

newsworthycharts/lib/datalist.py

@@ -171,8 +171,19 @@ class DataSet(MutableSequence):
 
     def __init__(self, *args):
         self.list = list()
+        self.min_val = inf
+        self.max_val = -inf
         self.extend(list(args))
 
+    def check(self, v):
+        # Update metadata with newly added data
+        values = [to_float(x[1]) for x in v]
+        values = [x for x in values if x is not None]
+        if values:
+            self.min_val = min(self.min_val, min(values))
+            self.max_val = max(self.max_val, max(values))
+        return v
+
     def __len__(self):
         return len(self.list)
 
@@ -183,9 +194,11 @@ class DataSet(MutableSequence):
         del self.list[i]
 
     def __setitem__(self, i, v):
+        v = self.check(v)
         self.list[i] = v
 
     def insert(self, i, v):
+        v = self.check(v)
         self.list.insert(i, v)
 
     def __str__(self):

{newsworthycharts-1.63.4.dist-info → newsworthycharts-1.64.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.63.4
+Version: 1.64.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.63.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.64.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -154,7 +154,7 @@ These settings are available for all chart types:
 
 **SerialChart**
 
-- type = 'line'  # line|bars
+- type = 'line'  # line|bars, or a list of types for each data serie
 - bar_width = 0.9  # percent of data point width
 - allow_broken_y_axis = True|False  # default depends on chart type
 - baseline = 0  # The “zero” line. Useful for plotting deviations, e.g. temperatures above/below mean
@@ -173,17 +173,20 @@ These settings are available for all chart types:
 
 **SeasonalChart**
 
+_ Inherits from SerialChart _
+
 **BubbleMap**
 
 - bubble_size = 1  # The size of the bubbles
 
 **CategoricalChart**
 
-- bar_orientation = "horizontal"  # [horizontal|vertical]
 - annotation_rotation = 0
-- stacked = False
+- bar_orientation = "horizontal"  # [horizontal|vertical]
+- colors = None  # A dictionary of colors
 - legend = True
-- colors = None
+- stacked = False
+- type = "bars"  # [bars|pie]
 
 **CategoricalChartWithReference**
 
@@ -252,6 +255,19 @@ Roadmap
 Changelog
 ---------
 
+- 1.64.0
+
+  - Improved handling of value axis in categorical charts
+  - Make sure at least one value axis tick is always printed
+  - Experimental support for simple, single series pie charts in CategoricalChart
+  - Fixed bug introduced in 1.63.3, where `decimals` and `units: percent` would not work together
+  - Fixed weird edge case when ticks would be offset for small numbers
+
+- 1.63.5
+
+  - Improved edge case handling when using fixed decimal places and remove duplicated ticks
+  - Tighter x-axis ticks in decennial data
+
 - 1.63.4
 
   - Fixed edge case in integer check

{newsworthycharts-1.63.4.dist-info → newsworthycharts-1.64.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=Y4F1H2k7Q3k6WNKCJmjcTRDKa8hK6_hUhba1GnqZJuI,1160
+newsworthycharts/__init__.py,sha256=Ar8KT2Z_t3lWJ367gTYTFtMKii3FmyxKPDhlK3qrz2s,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
-newsworthycharts/categoricalchart.py,sha256=LwOZ3VbNy9vzvoK0s77AkbfMt4CXVDSAhnsnBInUIrE,14764
-newsworthycharts/chart.py,sha256=dUh32lZ0OZhcKCf61BvqFcRAHAV7Wc9ob8Lt1jXSuhE,32558
+newsworthycharts/categoricalchart.py,sha256=4qzx17QcJX-Xw7COwyL_atIEgeVkNnlgS3B1v4-Q6dQ,15648
+newsworthycharts/chart.py,sha256=5JqEsWZUNefgXyhpznXcV5U1j-IOScsGWQoCijVMo9c,32841
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
@@ -16,7 +16,7 @@ newsworthycharts/custom/climate_cars.py,sha256=WyNLgjgRCv_zRrzVuk_BmcigFSzpzudjE
 newsworthycharts/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 newsworthycharts/lib/color_fn.py,sha256=ck65GzTS9oPgHUCnKDwX2z8zlnNyzncw97MmhXwi8z8,1282
 newsworthycharts/lib/colors.py,sha256=U04TDkvoMQkcldRFXfnwyLOTwq1SWW2se-Ad-DNcw9o,485
-newsworthycharts/lib/datalist.py,sha256=fsO_esZBt4Aw_4n_l2LuswAYArbM-8Z8G9DAXo1oVZU,5376
+newsworthycharts/lib/datalist.py,sha256=Lmb37IXZi9fqrV4qAZRFDtH4ctMDpOqH-ITV62mfarQ,5807
 newsworthycharts/lib/formatter.py,sha256=GNH43hE0bC17OgiV8LYH3YUrEhm7OJh9XzfSV4HVtHo,4838
 newsworthycharts/lib/geography.py,sha256=K0_teFmuPJwXX7Py-amJB_1YY5_gL2kBYhz1LrRCyTg,584
 newsworthycharts/lib/locator.py,sha256=rJHdgiA0LASRzdLINhTeU5zOoq1TCMgge4KOBWSagnM,3041
@@ -28,8 +28,8 @@ newsworthycharts/rc/newsworthy,sha256=vbYTav1w3DmB5tpaaV7Xl5q7TQJsc9eou6pLCoWc2v
 newsworthycharts/translations/datawrapper_regions.csv,sha256=fzZcQRX6RFMlNNP8mpgfYNdR3Y0QAlQxDXk8FXTaWWI,9214
 newsworthycharts/translations/regions.py,sha256=Nv1McQjggD4S3JRu82rDMTG3pqUVR13E5-FBpSYbm98,239
 newsworthycharts/translations/se_municipalities.csv,sha256=br_mm-IvzQtj_W55_ATREhJ97jWnCweBFlDAVY2EBxA,7098
-newsworthycharts-1.63.4.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.63.4.dist-info/METADATA,sha256=kxlCxLX3F38SdbYVz7LDAli8uQNQRVMjz4Qti0GM-yU,29572
-newsworthycharts-1.63.4.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.63.4.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.63.4.dist-info/RECORD,,
+newsworthycharts-1.64.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.64.0.dist-info/METADATA,sha256=Bd6gWjBOcSYe5uGZju_Ohtt_lqmkd1I_KOjsTzyFpZs,30226
+newsworthycharts-1.64.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.64.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.64.0.dist-info/RECORD,,