newsworthycharts 1.65.3__py3-none-any.whl → 1.66.0__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/categoricalchart.py

@@ -25,32 +25,39 @@ class CategoricalChart(Chart):
         return self.stacked
 
     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))]
+        if len(self.data) > 1:
+            subaxes = self._fig.subplots(1, len(self.data))
+        for idx, serie in enumerate(self.data):
+            if len(self.data) == 1:
+                subax = self.ax
+            else:
+                subax = subaxes[idx]
 
-        explode = [0.1 if x == self.highlight else 0 for x in labels]
+            values = [to_float(x[1]) for x in serie]
+            labels = [x[0] for x in serie]
 
-        self.ax.pie(
-            values,
-            labels=labels,
-            startangle=90,
-            colors=colors,
-            explode=explode
-        )
-        self.ax.axis('equal')
+            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]
+            subax.pie(
+                values,
+                labels=labels,
+                startangle=90,
+                colors=colors,
+                explode=explode
+            )
+            subax.axis('equal')
+            # `labels` in pie charts are used to label the series, not the values
+            if self.labels:
+                subax.set_title(self.labels[idx], loc='center', y=0.04)
 
-        self._setup_legend()
+        self.ax.axis('off')
 
     def _add_data(self):
         if self.type == "pie":
@@ -339,7 +346,7 @@ class ProgressChart(CategoricalChart):
 
             # rect.set_linewidth(1)
             # rect.set_edgecolor(color_progress)
-        
+
         # LABELING: Target
         if self.target_label:
             offset = 25

newsworthycharts/chart.py

@@ -856,7 +856,7 @@ class Chart(object):
         if self._subtitle_elem:
             rel_height += self._text_rel_height(self._subtitle_elem)
             # Adds a fixed margin below
-            rel_height += 0.008
+            rel_height += 0.012
             # rel_height += 15 / self._h
         return rel_height
 

{newsworthycharts-1.65.3.dist-info → newsworthycharts-1.66.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.65.3
+Version: 1.66.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.65.3.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.66.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -259,6 +259,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.66.0
+
+  - Support multiple data series in pie charts (displayed as small multiples)
+
+
+- 1.65.4
+
+  - Revert some of the title margin changes
+
 - 1.65.3
 
   - Dynamic title font size adjustments

{newsworthycharts-1.65.3.dist-info → newsworthycharts-1.66.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=ODCtHqJexpBEQZZc3IXGci1BSm9InC4RbbjH4T0gNgo,1160
+newsworthycharts/__init__.py,sha256=dPnI3-O29XlaYmTwMFQBa7XfStx-E5cEUxSrGXbB8iw,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
-newsworthycharts/categoricalchart.py,sha256=wLrS8H69Sx3FT-0r3w3ZOIC83IHb8HCHD0zTsXiIiNA,15737
-newsworthycharts/chart.py,sha256=uXMjIM33DHpHSabQcodc-wniKJ0AaSTrtY9UavC8EUU,34374
+newsworthycharts/categoricalchart.py,sha256=iU0itO0_wTxXP_ebp_2mq0hxTYiPqM23BX1dDouLUhA,16101
+newsworthycharts/chart.py,sha256=FEQRAvdfX0x3KWFBxFEpGhh3w6dRMX5dTw-VIFPo4jA,34374
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
@@ -28,8 +28,8 @@ newsworthycharts/rc/newsworthy,sha256=yOIZvYS6PG1u19VMcdtfj9vbihKQsey5IprwqK59Kg
 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.65.3.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.65.3.dist-info/METADATA,sha256=4dOLUm5Cvev74zXZek-hHMdY2aZQLt6tQoUjvJACEmo,30850
-newsworthycharts-1.65.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.65.3.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.65.3.dist-info/RECORD,,
+newsworthycharts-1.66.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.66.0.dist-info/METADATA,sha256=SqN-YYHap7GyKv7Xy8y5yGQ4pHUtEFzDE_WO_4C__sI,30995
+newsworthycharts-1.66.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.66.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.66.0.dist-info/RECORD,,