newsworthycharts 1.57.0__tar.gz → 1.57.2__tar.gz

{newsworthycharts-1.57.0/newsworthycharts.egg-info → newsworthycharts-1.57.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.57.0
+Version: 1.57.2
 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.57.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.57.2.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -224,9 +224,19 @@ Roadmap
 Changelog
 ---------
 
+- 1.57.2
+
+  - reduce excessive padding in ctagoerical vertical charts
+  - improved padding and margin logic for titles/subtitles (taking line spacing into account)
+
+- 1.57.1
+
+  - Fix missing outline in choropleth maps
+  - matplotlib==3.8.4; Pillow==10.3.0
+
 - 1.57.0
 
-  - Changes z-ordering so that line are always on top of bars, and ylines/zero lines are behind lines but in front of bars
+  - Changed z-ordering so that line are always on top of bars, and ylines/zero lines are behind lines but in front of bars
   - Avoid using the same color for trendline and lines
   - `yline` was moved to the SerialChart class, where it makes sense.
 

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2}/README.rst

@@ -211,9 +211,19 @@ Roadmap
 Changelog
 ---------
 
+- 1.57.2
+
+  - reduce excessive padding in ctagoerical vertical charts
+  - improved padding and margin logic for titles/subtitles (taking line spacing into account)
+
+- 1.57.1
+
+  - Fix missing outline in choropleth maps
+  - matplotlib==3.8.4; Pillow==10.3.0
+
 - 1.57.0
 
-  - Changes z-ordering so that line are always on top of bars, and ylines/zero lines are behind lines but in front of bars
+  - Changed z-ordering so that line are always on top of bars, and ylines/zero lines are behind lines but in front of bars
   - Avoid using the same color for trendline and lines
   - `yline` was moved to the SerialChart class, where it makes sense.
 

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2}/newsworthycharts/__init__.py

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

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2}/newsworthycharts/categoricalchart.py

@@ -16,7 +16,7 @@ class CategoricalChart(Chart):
         self.stacked = False
         self.legend = True
 
-        # Optional: specify a list of colors (for mulitple datasets)
+        # Optional: specify a list of colors (for multiple datasets)
         self.colors = None
 
     def _add_data(self):
@@ -144,8 +144,8 @@ class CategoricalChart(Chart):
                     kwargs["bottom"] = cum_values[i - 1]
                 self.ax.bar(bar_pos, values, **kwargs)
 
-        margin = 0.02  # above and below first/last bar on horizontal
         if self.bar_orientation == "horizontal":
+            margin = 0.02  # above and below first/last bar on horizontal
             self.ax.set_yticks(bar_pos)
             self.ax.set_yticklabels(categories)
             self.ax.invert_yaxis()
@@ -158,6 +158,7 @@ class CategoricalChart(Chart):
             self._fig.subplots_adjust(left=margin)
 
         elif self.bar_orientation == "vertical":
+            margin = 0.01  # above and below first/last bar on horizontal
             self.ax.margins(margin, 0)
             self.ax.set_xticks(bar_pos)
             self.ax.set_xticklabels(categories)

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2}/newsworthycharts/chart.py

@@ -168,7 +168,7 @@ class Chart(object):
             ismath=False,
         )
         num_lines = len(obj._get_wrapped_text().split("\n"))
-        return (h * num_lines) / float(self._h)
+        return (h * (num_lines * 1.4)) / float(self._h)  # 1.4 is the line spacing used everywhere
 
     def _rel_height(self, obj):
         """ Get the relative height of a chart object to the whole canvas.
@@ -273,7 +273,7 @@ class Chart(object):
     def _add_title(self, title_text):
         """Add a title."""
         # y=1 wraps title heavily, hence .9999
-        text = self._fig.suptitle(title_text, wrap=True, x=0, y=0.985,
+        text = self._fig.suptitle(title_text, wrap=True, x=0, y=0.999,
                                   horizontalalignment="left",
                                   multialignment="left",
                                   fontproperties=self._title_font)
@@ -755,7 +755,7 @@ class Chart(object):
         rel_height = 0
         if self._title_elem:
             rel_height += self._text_rel_height(self._title_elem)
-            # Adds a fixes margin below
+            # Adds a fixed margin below
             rel_height += 30 / self._h
         return rel_height
 
@@ -764,8 +764,8 @@ class Chart(object):
         rel_height = 0
         if self._subtitle_elem:
             rel_height += self._text_rel_height(self._subtitle_elem)
-            # Adds a fixes margin below
-            rel_height += 30 / self._h
+            # Adds a fixed margin below
+            rel_height += 15 / self._h
         return rel_height
 
     @property
@@ -773,7 +773,7 @@ class Chart(object):
         rel_height = 0
         if self._note_elem:
             rel_height += self._text_rel_height(self._note_elem)
-            # Adds a fixes margin below
+            # Adds a fixed margin below
             rel_height += 10 / self._h
         return rel_height
 

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2}/newsworthycharts/choroplethmap.py

@@ -2,7 +2,6 @@
 Simple choropleths for common administrative areas
 """
 from .map import Map
-from shapely.geometry.multipolygon import MultiPolygon
 import geopandas as gpd
 import numpy as np
 import pandas as pd
@@ -112,27 +111,13 @@ class ChoroplethMap(Map):
 
         fig = df.plot(ax=self.ax, **args)
         # Add outer edge
-        # unary_union does not work with Multipolygons
-        mp = MultiPolygon([g for g in df.explode(index_parts=True).geometry])
-        gpd.GeoSeries(mp.boundary).plot(
+        gpd.GeoSeries(df.unary_union).plot(
             ax=self.ax,
             edgecolor="lightgrey",
             linewidth=0.2,
+            facecolor="none",
             color="none",
         )
-        """
-        unary = df.unary_union
-        if unary.geom_type == "Polygon":
-            # We don't know in advance if unary_union will produce a polugon or a multipolygon
-            unary = MultiPolygon([unary])
-        for uu in unary.geoms:
-            gpd.GeoSeries(uu).plot(
-                ax=self.ax,
-                edgecolor="lightgrey",
-                linewidth=0.2,
-                facecolor="none",
-            )
-        """
         self.ax.axis("off")
 
         # Format numbers in legend

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.57.0
+Version: 1.57.2
 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.57.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.57.2.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -224,9 +224,19 @@ Roadmap
 Changelog
 ---------
 
+- 1.57.2
+
+  - reduce excessive padding in ctagoerical vertical charts
+  - improved padding and margin logic for titles/subtitles (taking line spacing into account)
+
+- 1.57.1
+
+  - Fix missing outline in choropleth maps
+  - matplotlib==3.8.4; Pillow==10.3.0
+
 - 1.57.0
 
-  - Changes z-ordering so that line are always on top of bars, and ylines/zero lines are behind lines but in front of bars
+  - Changed z-ordering so that line are always on top of bars, and ylines/zero lines are behind lines but in front of bars
   - Avoid using the same color for trendline and lines
   - `yline` was moved to the SerialChart class, where it makes sense.
 

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2}/newsworthycharts.egg-info/requires.txt

@@ -1,5 +1,5 @@
 Babel<3,>=2.14.0
-Pillow==10.2.0
+Pillow==10.3.0
 PyYAML>=3
 adjustText==0.7.3
 boto3>=1.26
@@ -7,7 +7,7 @@ geopandas==0.14.3
 langcodes>=3.3
 mapclassify==2.6.1
 matplotlib-label-lines==0.5.1
-matplotlib==3.8.3
+matplotlib==3.8.4
 numpy<2,>=1.21.0
 python-dateutil<3,>=2
 requests>=2.22

{newsworthycharts-1.57.0 → newsworthycharts-1.57.2}/setup.py

@@ -25,14 +25,14 @@ setup(
     python_requires='>=3.9',
     install_requires=[
         "boto3>=1.26",
-        "matplotlib==3.8.3",
+        "matplotlib==3.8.4",
         "langcodes>=3.3",
         "Babel>=2.14.0,<3",
         "PyYAML>=3",
         "adjustText==0.7.3",
         "numpy>=1.21.0,<2",
         "python-dateutil>=2,<3",
-        "Pillow==10.2.0",
+        "Pillow==10.3.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
         "geopandas==0.14.3",