newsworthycharts 1.65.1__tar.gz → 1.65.3__tar.gz

{newsworthycharts-1.65.1/newsworthycharts.egg-info → newsworthycharts-1.65.3}/PKG-INFO

@@ -1,15 +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
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -245,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 → newsworthycharts-1.65.3}/README.rst

@@ -232,6 +232,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 → newsworthycharts-1.65.3}/newsworthycharts/__init__.py

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

{newsworthycharts-1.65.1 → newsworthycharts-1.65.3}/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-1.65.1 → newsworthycharts-1.65.3}/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 → newsworthycharts-1.65.3/newsworthycharts.egg-info}/PKG-INFO

@@ -1,15 +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
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -245,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 → newsworthycharts-1.65.3}/newsworthycharts.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ newsworthycharts/lib/utils.py
 newsworthycharts/maps/se-4.gpkg
 newsworthycharts/maps/se-7.gpkg
 newsworthycharts/rc/newsworthy
-newsworthycharts/translations/.~lock.datawrapper_regions.csv#
 newsworthycharts/translations/datawrapper_regions.csv
 newsworthycharts/translations/regions.py
 newsworthycharts/translations/se_municipalities.csv

{newsworthycharts-1.65.1 → newsworthycharts-1.65.3}/test/test_categorical_chart.py

@@ -338,23 +338,3 @@ def test_progress_chart_with_multiple_targets():
     c = ProgressChart.init_from(chart_obj, storage=local_storage)
 
     c.render("progress_chart_with_multiple_targets", "png")
-
-def test_basic_progress_chart():
-    chart_obj = {
-        "data": [
-            [
-                ("A", .9404),
-                ("B", .8868),
-                ("C", .8260),
-            ],
-        ],
-        "target": 1,
-        "value_labels": "progress",
-        "width": 700,
-        "height": 400,
-        "units": "percent",
-        "bar_orientation": "horizontal",
-        "title": "Inga mål uppnås"
-    }
-    c = ProgressChart.init_from(chart_obj, storage=local_storage)
-    c.render("progress_chart_basic", "png")

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

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