newsworthycharts 1.67.0__py3-none-any.whl → 1.68.1__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/categoricalchart.py

@@ -29,7 +29,7 @@ class CategoricalChart(Chart):
         self.show_ticks = False
 
         if len(self.data) > 1:
-            subaxes = self._fig.subplots(1, len(self.data))
+            subaxes = self._fig.subplots(1, len(self.data), subplot_kw={"zorder": -1})
         patches = []
         for idx, serie in enumerate(self.data):
             if len(self.data) == 1:
@@ -52,18 +52,21 @@ class CategoricalChart(Chart):
                 labels=labels if legend_placement == "inline" else None,
                 startangle=90,
                 colors=colors,
-                explode=explode
+                explode=explode,
             )
             if idx == 0:
                 patches += _pie[0]
-            subax.axis('equal')
+            if len(self.data) > 1:
+                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)
         if legend_placement == "inline":
             self.legend = False
         elif legend_placement == "legend":
-            self.ax.legend(patches, labels, loc='best', frameon=True, fancybox=True).set_zorder(100)
+            _ = self.ax.legend(patches, labels, loc='best', frameon=True, fancybox=True)
+            _.set(zorder=20)
+            # self.ax.figure.subplots_adjust()
         elif legend_placement == "outside":
             _ = self.ax.legend(patches, labels, bbox_to_anchor=(1.04, 1), loc="upper left")
             _.set(zorder=20)

newsworthycharts/chart.py

@@ -504,6 +504,9 @@ class Chart(object):
                 except AttributeError:
                     # values is undefined for catCharts
                     pass
+                except ValueError:
+                    # non-numerical data
+                    pass
                 if all_integers:
                     self.decimals = 0
                 else:
@@ -648,7 +651,7 @@ class Chart(object):
             # ticks labels
             tick_label_height
             # some padding
-            # + 30 / self._h
+            + 15 / self._h
             #  chart notes (if any)
             + self._note_rel_height
             #  chart caption and logo (if any)

newsworthycharts/lib/datalist.py

@@ -176,9 +176,12 @@ class DataSet(MutableSequence):
         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]
+        # Update metadata with newly added data, if numerical
+        try:
+            values = [to_float(x[1]) for x in v]
+            values = [x for x in values if x is not None]
+        except ValueError:
+            values = None
         if values:
             self.min_val = min(self.min_val, min(values))
             self.max_val = max(self.max_val, max(values))

{newsworthycharts-1.67.0.dist-info → newsworthycharts-1.68.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.67.0
+Version: 1.68.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.67.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.68.1.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,7 +11,7 @@ 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: matplotlib ==3.9.3
 Requires-Dist: langcodes >=3.3
 Requires-Dist: Babel <3,>=2.14.0
 Requires-Dist: PyYAML >=3
@@ -259,6 +259,17 @@ Roadmap
 Changelog
 ---------
 
+- 1.68.1
+
+  - Fixed crash in `ChoroplethMap` with non-numerical values
+  - Fix Matplotlib version in setup.py
+
+- 1.68.0
+
+  - Matplotlib==3.9.3
+  - More padding below chart
+  - Fix zorder issue in labeled multiple pie charts
+
 - 1.67.0
 
   - Fixed label margins in pie charts

{newsworthycharts-1.67.0.dist-info → newsworthycharts-1.68.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=t7zoA4QcnDRPHIEjlFDnSD3BUJrVpJjyY2dxNvpp_MQ,1160
+newsworthycharts/__init__.py,sha256=F3SsT4qDwn9ebj33Gty_CWJGsedd0eN8EtF3MDZmRvM,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
-newsworthycharts/categoricalchart.py,sha256=3XXBzIILkUl0721FN9j8cDK5mSjh8vK0JQGXCRu9ilo,18048
-newsworthycharts/chart.py,sha256=9M4LE5UUN5kMaVQ1jnCAKpACU3oZBMPPUpodad9sBT4,34390
+newsworthycharts/categoricalchart.py,sha256=YL3pzq8a7U5F0MpeRIAEwCAHw1BRDyKjoaAhf-UyRDo,18179
+newsworthycharts/chart.py,sha256=jurOkIrm8TRpuL-Fj0AdBJXmjrdkZ-U2w_TaOysQvAs,34489
 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=ZyGHnHbn57npITgr2HmtfrS-Xv8U1muCMDOcOwQnlM8,6345
+newsworthycharts/lib/datalist.py,sha256=-LdGFE0SOvjLnIRZ6eoJoijDaG3SeUPNIDPBjbm5A2U,6433
 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=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.67.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.67.0.dist-info/METADATA,sha256=drsWEzZU63lSRO05hy_VT2Mt13UGWyZNW8j_hwI43pc,31262
-newsworthycharts-1.67.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.67.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.67.0.dist-info/RECORD,,
+newsworthycharts-1.68.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.68.1.dist-info/METADATA,sha256=-IKPmEFJ4voMBH5obNcNZz_tcu3XShDR4e4SNuzjBzY,31487
+newsworthycharts-1.68.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.68.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.68.1.dist-info/RECORD,,