newsworthycharts 1.71.1__tar.gz → 1.71.3__tar.gz

{newsworthycharts-1.71.1/newsworthycharts.egg-info → newsworthycharts-1.71.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.1
+Version: 1.71.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.71.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.3.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -15,13 +15,13 @@ Requires-Dist: matplotlib==3.10.0
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
-Requires-Dist: adjustText==0.7.3
+Requires-Dist: adjustText==1.3.0
 Requires-Dist: numpy>2
 Requires-Dist: python-dateutil<3,>=2
 Requires-Dist: Pillow==11.1.0
 Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas>=1
+Requires-Dist: geopandas==1.0.1
 Requires-Dist: mapclassify==2.8.1
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
@@ -150,6 +150,7 @@ These settings are available for all chart types:
 - logo = None  # Path to image that will be embedded in the caption area. Can also be set though a style property
 - color_fn = None  # Custom coloring function
 - legend_title = None  # Title for the legend
+- revert_value_axis = False  # Revert the value axis to put  0 top
 
 **SerialChart**
 
@@ -269,6 +270,24 @@ Roadmap
 Changelog
 ---------
 
+- 1.71.3
+
+  - Revert 1.71.2 changes to rendering, to make file sizes predictable again
+
+- 1.71.2
+
+  - Annotates all isolated value sequences in BumpChart
+  - Allows shared ranks in BumpChart
+  - Prefers showing all ticks in BumpChart
+  - Fixes some padding issues with reverted value axis
+  - Adds `revert_value_axis` option for all charts
+  - New custom label collision algorithm for serial charts
+  - Removes unused(?) label collision algorithm for categorical charts
+  - Upgrades adjustText (now used in ScatterPlot only) to 1.3.0
+  - Adds `_after_add_data()` hook for subclasses and extensions
+  - Pins Geopandas version (currently 1.0.1)
+  - Smaller vertical annotation offset (partially reverting 1.71.1)
+
 - 1.71.1
 
   - Allow setting line marker size and style in `BumpChart`

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/README.rst

@@ -124,6 +124,7 @@ These settings are available for all chart types:
 - logo = None  # Path to image that will be embedded in the caption area. Can also be set though a style property
 - color_fn = None  # Custom coloring function
 - legend_title = None  # Title for the legend
+- revert_value_axis = False  # Revert the value axis to put  0 top
 
 **SerialChart**
 
@@ -243,6 +244,24 @@ Roadmap
 Changelog
 ---------
 
+- 1.71.3
+
+  - Revert 1.71.2 changes to rendering, to make file sizes predictable again
+
+- 1.71.2
+
+  - Annotates all isolated value sequences in BumpChart
+  - Allows shared ranks in BumpChart
+  - Prefers showing all ticks in BumpChart
+  - Fixes some padding issues with reverted value axis
+  - Adds `revert_value_axis` option for all charts
+  - New custom label collision algorithm for serial charts
+  - Removes unused(?) label collision algorithm for categorical charts
+  - Upgrades adjustText (now used in ScatterPlot only) to 1.3.0
+  - Adds `_after_add_data()` hook for subclasses and extensions
+  - Pins Geopandas version (currently 1.0.1)
+  - Smaller vertical annotation offset (partially reverting 1.71.1)
+
 - 1.71.1
 
   - Allow setting line marker size and style in `BumpChart`

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/newsworthycharts/__init__.py

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

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/newsworthycharts/categoricalchart.py

@@ -1,6 +1,6 @@
 from .chart import Chart
 from .lib.utils import to_float
-from adjustText import adjust_text
+# from adjustText import adjust_text
 import numpy as np
 
 
@@ -251,11 +251,15 @@ class CategoricalChart(Chart):
                     )
                     if idx > 0:
                         texts += [*_texts]
+                """
                 adjust_text(
                     texts,
                     ax=self.ax,
                     autoalign="x" if self.bar_orientation == "horizontal" else "y",
+                    only_move="x" if self.bar_orientation == "horizontal" else "y",
+                    # will replace autoalign in newer versions
                 )
+                """
 
 
 class CategoricalChartWithReference(CategoricalChart):

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/newsworthycharts/chart.py

@@ -242,11 +242,11 @@ class Chart(object):
         elif direction == "left":
             opts["verticalalignment"] = "center"
             opts["horizontalalignment"] = "right"
-            opts["xytext"] = (-offset, -self._nwc_style["annotation.fontsize"] / 0.75)
+            opts["xytext"] = (-offset, -self._nwc_style["annotation.fontsize"] / 4)
         elif direction == "right":
             opts["verticalalignment"] = "center"
             opts["horizontalalignment"] = "left"
-            opts["xytext"] = (offset, -self._nwc_style["annotation.fontsize"] / 0.75)
+            opts["xytext"] = (offset, -self._nwc_style["annotation.fontsize"] / 4)
         else:
             msg = f"'{direction}' is an unknown direction for an annotation"
             raise Exception(msg)
@@ -255,7 +255,7 @@ class Chart(object):
         opts.update(kwargs)
 
         ann = self.ax.annotate(text, xy=xy, **opts)
-        # ann = self.ax.text(text, xy[0], xy[1])
+        # ann = self.ax.text(text, xy[0], xy[1], **opts)
         self._annotations.append(ann)
 
         return ann
@@ -343,6 +343,13 @@ class Chart(object):
         pass
         # raise NotImplementedError("This method should be overridden")
 
+    def _after_add_data(self):
+        """ Extra operations after data has been added.
+        Typically used by subclasses and extensions
+        """
+        pass
+        # raise NotImplementedError("This method should be overridden")
+
     def _mark_broken_axis(self, axis="y"):
         """Adds a symbol to mark that an axis is broken
         """
@@ -477,6 +484,8 @@ class Chart(object):
         # Apply all changes, in the correct order for consistent rendering
         if len(self.data):
             self._add_data()
+        # Extra hook for extensions and subclasses
+        self._after_add_data()
 
         # Calculate size in inches
         # Until 1.45 we did this on init, but now we'd like to enable dynamic heights
@@ -673,7 +682,6 @@ class Chart(object):
             + self._footer_rel_height
         )
         # print(sub_canvas_height, self._note_rel_height, self._footer_rel_height)
-        self._fig.subplots_adjust(bottom=sub_canvas_height)
 
         if self.revert_value_axis:
             if hasattr(self, "orientation") and self.orientation == "horizontal":
@@ -687,6 +695,7 @@ class Chart(object):
             value_ticks = [x for x in value_ticks if x <= self.data.max_val and x >= self.ymin]
             value_axis.set_ticks(value_ticks)
             # self.ax.set_ylim(self.data.max_val, self.ymin)
+        self._fig.subplots_adjust(bottom=sub_canvas_height)
 
     @classmethod
     def init_from(cls, args: dict, storage=LocalStorage(),
@@ -724,7 +733,7 @@ class Chart(object):
             chart.ticks = args["ticks"]
         return chart
 
-    def render(
+    def _render(
         self,
         key: str,
         img_format: str,
@@ -733,9 +742,6 @@ class Chart(object):
         storage_options: dict={}
     ):
         """Render file, and send to storage."""
-        # Apply all changes, in the correct order for consistent rendering
-        self._apply_changes_before_rendering(factor=factor, transparent=transparent)
-
         # Save plot in memory, to write it directly to storage
         buf = BytesIO()
         args = {
@@ -775,6 +781,19 @@ class Chart(object):
         buf.seek(0)
         self._storage.save(key, buf, img_format, storage_options)
 
+    def render(
+        self,
+        key: str,
+        img_format: str,
+        transparent: bool=False,
+        factor: int=1,
+        storage_options: dict={}
+    ):
+        """Render file, and send to storage."""
+        # Apply all changes, in the correct order for consistent rendering
+        self._apply_changes_before_rendering(factor=factor, transparent=transparent)
+        self._render(key, img_format, transparent, factor, storage_options)
+
     def render_all(self, key: str, transparent=False, factor=1, storage_options={}):
         """
         Render all available formats
@@ -785,44 +804,7 @@ class Chart(object):
         for file_format in self.file_types:
             if file_format == "dw":
                 continue
-
-            # Save plot in memory, to write it directly to storage
-            buf = BytesIO()
-            args = {
-                'format': file_format,
-                'transparent': transparent,
-                'dpi': self._fig.dpi * factor,
-            }
-            if file_format == "pdf":
-                args["metadata"] = {
-                    'Creator': "Newsworthy",
-                    'Producer': f"NWCharts {__version__}",
-                }
-            elif file_format == "png":
-                args["metadata"] = {
-                    'Author': "Newsworthy",
-                    'Software': f"NWCharts {__version__}",
-                }
-            elif file_format == "svg":
-                args["metadata"] = {
-                    'Publisher': "Newsworthy",
-                    'Creator': f"NWCharts {__version__}",
-                }
-            elif file_format in ["jpg", "jpeg"]:
-                args["pil_kwargs"] = {
-                    "quality": 100,
-                    "optimize": True,
-                }
-                """
-                Not yet implemented in Pillow
-                args["metadata"] = {
-                    'Publisher': "Newsworthy",
-                    'Creator': f"NWCharts {__version__}",
-                }
-                """
-            self._fig.savefig(buf, **args)  # bbox_inches="tight")
-            buf.seek(0)
-            self._storage.save(key, buf, file_format, storage_options)
+            self._render(key, file_format, transparent, factor, storage_options)
 
     @property
     def title(self):

newsworthycharts-1.71.3/newsworthycharts/rankchart.py

@@ -0,0 +1,115 @@
+"""
+A chart showing ranking over time (like ”most popular baby names”)
+"""
+from .serialchart import SerialChart
+from .lib.utils import to_date
+import numpy as np
+
+
+class BumpChart(SerialChart):
+    """Plot a rank chart
+
+        Data should be a list of iterables of (rank, date string) tuples, eg:
+    `[ [("2010-01-01", 2), ("2011-01-01", 3)] ]`, combined with a list of
+    labels in the same order
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(BumpChart, self).__init__(*args, **kwargs)
+
+        if self.line_width is None:
+            self.line_width = 0.9
+        self.label_placement = 'none'
+        self.type = "line"
+        self.decimals = 0
+        self.revert_value_axis = True
+        self.ymin = 1
+        self.allow_broken_y_axis = False
+        self.grid = False
+        self.accentuate_baseline = False
+
+        self.line_marker = "o-"
+        self.line_marker_size = 5
+
+    def _get_line_colors(self, i, *args):
+        if not self.data:
+            # Don't waste time
+            return None
+        if self.highlight and self.highlight in self.labels and i == self.labels.index(self.highlight):
+            return self._nwc_style["strong_color"]
+        elif self.colors and i < len(self.colors):
+            return self.colors[i]
+        return self._nwc_style["neutral_color"]
+
+    def _after_add_data(self):
+        # Print out every rank
+        if self.data.max_val < 30:
+            _range = list(range(1, int(self.data.max_val) + 1))
+            self.ax.yaxis.set_ticks(_range, _range)
+        # Add labels
+        slots_occupied = {
+            to_date(k): [] for k in self.data.x_points
+        }
+        for i, serie in enumerate(self.data):
+            values = np.array(self.serie_values[i], dtype=np.float64)
+            dates = [to_date(x[0]) for x in serie]
+            color = self._get_line_colors(i)
+
+            endpoints = [
+                (d, values[idx])
+                for (idx, d) in enumerate(dates) if idx == len(dates) - 1 or np.isnan(values[idx + 1])
+            ]
+            for ep in endpoints:
+                position = ep[1]
+                while position in slots_occupied[ep[0]]:
+                    position += 1
+                slots_occupied[ep[0]].append(position)
+                self._annotate_point(
+                    self.labels[i],
+                    (ep[0], position),
+                    "right",
+                    offset=15,
+                    color=color,
+                    va="center",
+                    # arrowprops=dict(arrowstyle="->", color=color),
+                )
+        """
+        labels = []
+        for i, serie in enumerate(self.data):
+            values = np.array(self.serie_values[i], dtype=np.float64)
+            dates = [to_date(x[0]) for x in serie]
+            color = self._get_line_colors(i)
+
+            endpoints = [
+                (d, values[idx])
+                for (idx, d) in enumerate(dates) if idx == len(dates) - 1 or np.isnan(values[idx + 1])
+            ]
+            for ep in endpoints:
+                lbl = self._annotate_point(
+                    self.labels[i],
+                    (ep[0], ep[1]),
+                    "right",
+                    offset=15,
+                    color=color,
+                    va="center",
+                    # arrowprops=dict(arrowstyle="->", color=color),
+                )
+                loops = 0
+                overlap = True if len(labels) > 0 else False
+                while overlap:
+                    for i, bb in enumerate(labels):
+                        if i == len(labels) - 1:
+                            overlap = False
+                            break
+                        bbox1 = lbl.get_window_extent()
+                        bbox2 = labels[i].get_window_extent()
+                        print(bbox1, bbox2)
+                        if bbox1.y1 < bbox2.y0 + 10 and bbox1.x1 > bbox2.x0 + 5:  # allow for some overlap
+                            xy1 = lbl.xyann
+                            lbl.xyann = (xy1[0], xy1[1] + 1)
+                            break
+                        loops += 1
+                    if loops > 500:
+                        break
+                labels.append(lbl)
+        """

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/newsworthycharts/scatterplot.py

@@ -114,8 +114,13 @@ class ScatterPlot(Chart):
 
             # These settings could be fine-tuned
             # Weren't able to add lines between points and labels for example
-            adjust_text(self._annotations, ax=self.ax, autoalign="y",
-                        expand_points=(1, 1),)
+            adjust_text(
+                self._annotations,
+                ax=self.ax,
+                autoalign="y",
+                only_move="y",  # replacing autoalign i newer versions
+                expand_points=(1, 1),
+            )
 
         if self.ymin is not None:
             self.ax.set_ylim(self.ymin)

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/newsworthycharts/serialchart.py

@@ -4,7 +4,7 @@ from .lib.utils import to_float, to_date, guess_date_interval
 import numpy as np
 from math import inf
 from dateutil.relativedelta import relativedelta
-from adjustText import adjust_text
+# from adjustText import adjust_text
 from labellines import labelLines
 
 
@@ -179,6 +179,7 @@ class SerialChart(Chart):
                 # Replace None values with 0's to be able to plot bars
                 _values = [0 if v is None else v for v in _values]
             serie_values.append(_values)
+        self.serie_values = serie_values
 
         #  Select a date to highlight
         highlight_date = None
@@ -306,6 +307,7 @@ class SerialChart(Chart):
                         offset=15,
                         color=color,
                         va="center",
+                        # arrowprops=dict(arrowstyle="->", color=color),
                     )
                     # store labels to check for overlap later
                     line_label_elems.append(lbl)
@@ -575,8 +577,11 @@ class SerialChart(Chart):
 
             padding_top = ymax * 0.15
 
-        self.ax.set_ylim(ymin=ymin - padding_bottom,
-                         ymax=ymax + padding_top)
+        if not self.revert_value_axis:
+            self.ax.set_ylim(
+                ymin=ymin - padding_bottom,
+                ymax=ymax + padding_top,
+            )
 
         self.ax.yaxis.set_major_formatter(y_formatter)
         self.ax.yaxis.grid(self.grid)
@@ -676,12 +681,13 @@ class SerialChart(Chart):
             )
 
     def _adust_texts_vertically(self, elements, ha="left"):
+        """
+        from adjustText import get_bboxes
         if len(elements) == 2:
             # Hack: check for overlap and adjust labels only
             # if such overlap exist.
             # `adjust_text` tended to offset labels unnecessarily
             # but it might just be that I haven't worked out how to use it properly
-            from adjustText import get_bboxes
             bb1, bb2 = get_bboxes(elements, self._fig.canvas.get_renderer(), (1.0, 1.0), self.ax)
             if (
                 # first label is above
@@ -692,4 +698,32 @@ class SerialChart(Chart):
                 adjust_text(elements, autoalign="y", ha=ha)
 
         else:
-            adjust_text(elements, autoalign="y", ha=ha)
+            adjust_text(
+                elements,
+                autoalign="y",
+                only_move="y",  # will replace autoalign in newer versions
+                ax=self.ax,
+                max_move=(0, 10), # (10, 10) is default
+            )
+        """
+        overlap = True
+        loops = 0
+        while overlap:
+            for i, bb in enumerate(elements):
+                if i == len(elements) - 1:
+                    overlap = False
+                    break
+                bbox1 = elements[i].get_window_extent()
+                bbox2 = elements[i + 1].get_window_extent()
+                if bbox1.y1 > bbox2.y0 + 10 and bbox1.x1 > bbox2.x0 + 5:  # allow for some overlap
+                    loops += 1
+                    xy1 = elements[i].xyann
+                    # xy2 = elements[i + 1].xyann
+                    # elements[i].update_positions((bbox1.x0, bbox1.y0 - 5))
+                    # elements[i].update_positions((xy1[0], xy1[1] - 0.02))
+                    elements[i].xyann = (xy1[0], xy1[1] - 0.01)
+                    # elements[i].set(arrowprops=dict(arrowstyle="->"))
+                    # elements[i + 1].xyann = (xy2[0], xy2[1] + 0.005)
+                    break
+            if loops > 5_000:
+                break

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.1
+Version: 1.71.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.71.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.3.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -15,13 +15,13 @@ Requires-Dist: matplotlib==3.10.0
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
-Requires-Dist: adjustText==0.7.3
+Requires-Dist: adjustText==1.3.0
 Requires-Dist: numpy>2
 Requires-Dist: python-dateutil<3,>=2
 Requires-Dist: Pillow==11.1.0
 Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas>=1
+Requires-Dist: geopandas==1.0.1
 Requires-Dist: mapclassify==2.8.1
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
@@ -150,6 +150,7 @@ These settings are available for all chart types:
 - logo = None  # Path to image that will be embedded in the caption area. Can also be set though a style property
 - color_fn = None  # Custom coloring function
 - legend_title = None  # Title for the legend
+- revert_value_axis = False  # Revert the value axis to put  0 top
 
 **SerialChart**
 
@@ -269,6 +270,24 @@ Roadmap
 Changelog
 ---------
 
+- 1.71.3
+
+  - Revert 1.71.2 changes to rendering, to make file sizes predictable again
+
+- 1.71.2
+
+  - Annotates all isolated value sequences in BumpChart
+  - Allows shared ranks in BumpChart
+  - Prefers showing all ticks in BumpChart
+  - Fixes some padding issues with reverted value axis
+  - Adds `revert_value_axis` option for all charts
+  - New custom label collision algorithm for serial charts
+  - Removes unused(?) label collision algorithm for categorical charts
+  - Upgrades adjustText (now used in ScatterPlot only) to 1.3.0
+  - Adds `_after_add_data()` hook for subclasses and extensions
+  - Pins Geopandas version (currently 1.0.1)
+  - Smaller vertical annotation offset (partially reverting 1.71.1)
+
 - 1.71.1
 
   - Allow setting line marker size and style in `BumpChart`

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/newsworthycharts.egg-info/requires.txt

@@ -3,11 +3,11 @@ matplotlib==3.10.0
 langcodes>=3.3
 Babel<3,>=2.14.0
 PyYAML>=3
-adjustText==0.7.3
+adjustText==1.3.0
 numpy>2
 python-dateutil<3,>=2
 Pillow==11.1.0
 requests>=2.22
 matplotlib-label-lines==0.5.1
-geopandas>=1
+geopandas==1.0.1
 mapclassify==2.8.1

{newsworthycharts-1.71.1 → newsworthycharts-1.71.3}/setup.py

@@ -29,13 +29,13 @@ setup(
         "langcodes>=3.3",
         "Babel>=2.14.0,<3",
         "PyYAML>=3",
-        "adjustText==0.7.3",
+        "adjustText==1.3.0",
         "numpy>2",
         "python-dateutil>=2,<3",
         "Pillow==11.1.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
-        "geopandas>=1",
+        "geopandas==1.0.1",
         "mapclassify==2.8.1",
     ],
     setup_requires=["flake8"],

newsworthycharts-1.71.1/newsworthycharts/rankchart.py

@@ -1,40 +0,0 @@
-"""
-A chart showing ranking over time (like ”most popular baby names”)
-"""
-from .serialchart import SerialChart
-
-
-class BumpChart(SerialChart):
-    """Plot a rank chart
-
-        Data should be a list of iterables of (rank, date string) tuples, eg:
-    `[ [("2010-01-01", 2), ("2011-01-01", 3)] ]`, combined with a list of
-    labels in the same order
-    """
-
-    def __init__(self, *args, **kwargs):
-        super(BumpChart, self).__init__(*args, **kwargs)
-
-        if self.line_width is None:
-            self.line_width = 0.9
-        self.label_placement = 'line'
-        self.type = "line"
-        self.decimals = 0
-        self.revert_value_axis = True
-        self.ymin = 1
-        self.allow_broken_y_axis = False
-        self.grid = False
-        self.accentuate_baseline = False
-
-        self.line_marker = "o-"
-        self.line_marker_size = 5
-
-    def _get_line_colors(self, i, *args):
-        if not self.data:
-            # Don't waste time
-            return None
-        if self.highlight and self.highlight in self.labels and i == self.labels.index(self.highlight):
-            return self._nwc_style["strong_color"]
-        elif self.colors and i < len(self.colors):
-            return self.colors[i]
-        return self._nwc_style["neutral_color"]