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

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -91,12 +91,6 @@ class Chart(object):
         self._language = standardize_tag(language)
         self._locale = Locale.parse(self._language.replace("-", "_"))
 
-        # Dynamic typography
-        self._title_font = FontProperties()
-        self._title_font.set_family(self._nwc_style["title_font"])
-        self._title_font.set_size(self._style["figure.titlesize"])
-        self._title_font.set_weight(self._style["figure.titleweight"])
-
         self._fig = Figure(layout="tight")
         FigureCanvas(self._fig)
         self.ax = self._fig.add_subplot(111)
@@ -112,6 +106,15 @@ class Chart(object):
         if height:
             self._h = int(height)
 
+        # Dynamic typography
+        self._title_font = FontProperties()
+        # scale up slightly < 600px, scale down slightly > 600px
+        import math
+        adjusted_fontsize = math.log(self._h, 600)
+        self._title_font.set_family(self._nwc_style["title_font"])
+        self._title_font.set_size(int(adjusted_fontsize * self._style["figure.titlesize"]))
+        self._title_font.set_weight(self._style["figure.titleweight"])
+
         # Chart elements. Made available for fitting.
         self._title_elem = None
         self._subtitle_elem = None
@@ -633,8 +636,10 @@ class Chart(object):
 
         # Fit area below chart
         try:
-            tick_label_height = max([self._text_rel_height(lbl)
-                                    for lbl in self.ax.get_xticklabels()])
+            tick_label_height = max(
+                [self._text_rel_height(lbl)
+                    for lbl in self.ax.get_xticklabels()]
+            )
         except ValueError:
             # handle charts without ticks
             tick_label_height = 0
@@ -643,7 +648,7 @@ class Chart(object):
             # ticks labels
             tick_label_height
             # some padding
-            + 30 / self._h
+            # + 30 / self._h
             #  chart notes (if any)
             + self._note_rel_height
             #  chart caption and logo (if any)
@@ -842,7 +847,7 @@ class Chart(object):
         if self._title_elem:
             rel_height += self._text_rel_height(self._title_elem)
             # Adds a fixed margin below
-            rel_height += 30 / self._h
+            rel_height += 0.008
         return rel_height
 
     @property
@@ -851,7 +856,8 @@ class Chart(object):
         if self._subtitle_elem:
             rel_height += self._text_rel_height(self._subtitle_elem)
             # Adds a fixed margin below
-            rel_height += 15 / self._h
+            rel_height += 0.008
+            # rel_height += 15 / self._h
         return rel_height
 
     @property

newsworthycharts/rc/newsworthy

@@ -6,7 +6,7 @@ backend : Agg
 figure.dpi        : 150
 
 # Margins
-savefig.pad_inches  : 0.2
+savefig.pad_inches   : 0.2
 legend.borderaxespad : 0.7      # the margin between legend box and axes
 
 # Axes and ticks
@@ -65,4 +65,3 @@ lines.markersize : 8
 # Fill between lines
 #! fill_between_color : F7F4F4
 #! fill_between_alpha : 0.5
-

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

@@ -1,29 +1,29 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.65.1
+Version: 1.65.3
 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.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.3.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
+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 +259,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.3
+
+  - Dynamic title font size adjustments
+  - Further title margin adjustments
+
+- 1.65.2
+
+  - Title margin adjustments
+
 - 1.65.1
 
   - Fixed legend bug in ProgressChart

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

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=EGDm4UzvQMtB6QL_R1B1b9K2q75byHoVZtmNgz2imX4,1160
+newsworthycharts/__init__.py,sha256=ODCtHqJexpBEQZZc3IXGci1BSm9InC4RbbjH4T0gNgo,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=wLrS8H69Sx3FT-0r3w3ZOIC83IHb8HCHD0zTsXiIiNA,15737
-newsworthycharts/chart.py,sha256=y-OjOcFYL4YaqgJEdUyqN6sAqk-8a0wOz5vjktRCr6E,34170
+newsworthycharts/chart.py,sha256=uXMjIM33DHpHSabQcodc-wniKJ0AaSTrtY9UavC8EUU,34374
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
@@ -13,8 +13,6 @@ newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 newsworthycharts/custom/climate_cars.py,sha256=WyNLgjgRCv_zRrzVuk_BmcigFSzpzudjEAYmdvdBe8I,9407
-newsworthycharts/custom/pts.py,sha256=B_7y0rwvUMSlGoGopqlaS9RipjRrQ7cc4NXmQV_U31E,220
-newsworthycharts/custom/temperature.py,sha256=8WE5xXTzP1zLc655ltqdE7ypl2pguC6kX9HG_paW4BE,679
 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
@@ -26,14 +24,12 @@ newsworthycharts/lib/mimetypes.py,sha256=bL9HtVWbn2Of39LcBt4u4yelkr4bGZiyebq3OfL
 newsworthycharts/lib/utils.py,sha256=l4SUVB-8lnm3XHqHNo5KgZuZNv_VaFnrH76hrZmDq1s,7231
 newsworthycharts/maps/se-4.gpkg,sha256=oWw5j7FPVpI0ig67jNDim8qSn5SG8rcHp0014-uTKZM,290816
 newsworthycharts/maps/se-7.gpkg,sha256=Vmvqudq_ZtgV0sd6TY6kuk7vzqmYZCJmaxtsJ87q2a8,331776
-newsworthycharts/rc/newsworthy,sha256=vbYTav1w3DmB5tpaaV7Xl5q7TQJsc9eou6pLCoWc2vs,1589
-newsworthycharts/translations/.~lock.datawrapper_regions.csv#,sha256=lISyvTWrw8LTG01qMC_F5RxDwamXBeq9vJRKKwBYtRg,75
-newsworthycharts/translations/.~lock.se_municipalities.csv#,sha256=MEff-0d958fdtjBWyt0UnzZWf8OBFx-6PFKeGqGR8NM,80
+newsworthycharts/rc/newsworthy,sha256=yOIZvYS6PG1u19VMcdtfj9vbihKQsey5IprwqK59KgE,1589
 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.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.65.1.dist-info/METADATA,sha256=tGThxBsEGRsa_-sZGyAbldfJZQEdW9h-JxqN5kpGJSs,30708
-newsworthycharts-1.65.1.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-newsworthycharts-1.65.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.65.1.dist-info/RECORD,,
+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.65.1.dist-info → newsworthycharts-1.65.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

newsworthycharts/custom/pts.py

@@ -1,8 +0,0 @@
-"""Custom charts for bredbandsutredningen.
-"""
-
-from newsworthycharts import CategoricalChart
-
-class BroadbandTargetChart(CategoricalChart):
-    def _add_data(self):
-        super(BroadbandTargetChart, self)._add_data()

newsworthycharts/custom/temperature.py

@@ -1,20 +0,0 @@
-from newsworthycharts import SerialChart
-import numpy as np
-
-class TemperatueChart(SerialChart):
-    def _add_data(self):
-        self.color_fn = "positive_negative"
-        if len(self.data) != 1:
-            raise ValueError("TemperatueChart takes one and only one data series.")
-
-        dates = [x[0] for x in self.data[0]]
-        values = [x[1] for x in self.data[0]]
-        s = np.array(values, dtype=np.float)
-        mean = np.nanmean(s)
-        vs_mean = s - mean
-        self.data[0] = list(zip(dates, vs_mean.tolist()))
-        self._ymin = np.nanmin(vs_mean)
-        self.data.max_val = np.nanmax(vs_mean)
-        
-
-        super(TemperatueChart, self)._add_data()

newsworthycharts/translations/.~lock.datawrapper_regions.csv#

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

newsworthycharts/translations/.~lock.se_municipalities.csv#

@@ -1 +0,0 @@
-,jens,jens-XPS-13-9310,20.03.2023 13:52,file:///home/jens/.config/libreoffice/4;