newsworthycharts 1.61.4__tar.gz → 1.63.0__tar.gz

{newsworthycharts-1.61.4/newsworthycharts.egg-info → newsworthycharts-1.63.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.61.4
+Version: 1.63.0
 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.61.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.63.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -18,11 +18,11 @@ Requires-Dist: PyYAML>=3
 Requires-Dist: adjustText==0.7.3
 Requires-Dist: numpy>2
 Requires-Dist: python-dateutil<3,>=2
-Requires-Dist: Pillow==10.4.0
+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.6.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.
@@ -154,13 +154,13 @@ These settings are available for all chart types:
 
 **SerialChart**
 
-- type = 'line'  # line|bar|stacked_bar
+- type = 'line'  # line|bars
 - bar_width = 0.9  # percent of data point width
 - allow_broken_y_axis = True|False  # default depends on chart type
 - baseline = 0  # The “zero” line. Useful for plotting deviations, e.g. temperatures above/below mean
 - baseline_annotation = None  # A label for the baseline
 - line_width = None  # To override style settings
-- max_ticks = 7  # Maximum number of ticks on the x axis
+- max_ticks = 10  # Maximum number of ticks on the x axis. *Only used with yearly|decennial data* (this is yet to be fixed)
 - ticks = None  # Custom ticks on the x axis, as a list of lists or tuples: `[(2013-01-01, "-13"), (2014-01-01, "-14"), (2015-01-01, "-15")]`
 - ymin = None  # Minimum value on y axis. If None, it will be calculated from data
 - ymax = None  # Maximum value on y axis. If None, it will be calculated from data
@@ -248,11 +248,21 @@ Roadmap
   - Remove custom charts (add missing api interfaces to Chart class instead)
   - Remove DataWrapper class (out-of-scope)
   - Custom month locator with equal-width month bars
-  - Add color-ramp choropleth maps, as an alternative to binning
 
 Changelog
 ---------
 
+- 1.63.0
+
+  - Added `interval: decennial` to SerialChart. Will be autodetected if all data points are 10 years apart.
+  - Pillow==11.0.0
+  - mapclassify==2.8.1
+
+- 1.62.0
+
+  - max_ticks default is now 10 in SerialChart and 7 in ScatterPlot
+  - Don't print legend labels for empty series
+
 - 1.61.4
 
   - Make sure y axis and/or baseline is in front of bar padding

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/README.rst

@@ -127,13 +127,13 @@ These settings are available for all chart types:
 
 **SerialChart**
 
-- type = 'line'  # line|bar|stacked_bar
+- type = 'line'  # line|bars
 - bar_width = 0.9  # percent of data point width
 - allow_broken_y_axis = True|False  # default depends on chart type
 - baseline = 0  # The “zero” line. Useful for plotting deviations, e.g. temperatures above/below mean
 - baseline_annotation = None  # A label for the baseline
 - line_width = None  # To override style settings
-- max_ticks = 7  # Maximum number of ticks on the x axis
+- max_ticks = 10  # Maximum number of ticks on the x axis. *Only used with yearly|decennial data* (this is yet to be fixed)
 - ticks = None  # Custom ticks on the x axis, as a list of lists or tuples: `[(2013-01-01, "-13"), (2014-01-01, "-14"), (2015-01-01, "-15")]`
 - ymin = None  # Minimum value on y axis. If None, it will be calculated from data
 - ymax = None  # Maximum value on y axis. If None, it will be calculated from data
@@ -221,11 +221,21 @@ Roadmap
   - Remove custom charts (add missing api interfaces to Chart class instead)
   - Remove DataWrapper class (out-of-scope)
   - Custom month locator with equal-width month bars
-  - Add color-ramp choropleth maps, as an alternative to binning
 
 Changelog
 ---------
 
+- 1.63.0
+
+  - Added `interval: decennial` to SerialChart. Will be autodetected if all data points are 10 years apart.
+  - Pillow==11.0.0
+  - mapclassify==2.8.1
+
+- 1.62.0
+
+  - max_ticks default is now 10 in SerialChart and 7 in ScatterPlot
+  - Don't print legend labels for empty series
+
 - 1.61.4
 
   - Make sure y axis and/or baseline is in front of bar padding

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/newsworthycharts/chart.py

@@ -17,7 +17,8 @@ from matplotlib.font_manager import FontProperties
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 from matplotlib.figure import Figure
 from matplotlib.ticker import FuncFormatter
-from matplotlib.dates import DateFormatter, num2date
+from matplotlib.dates import DateFormatter, num2date, YearLocator
+
 from langcodes import standardize_tag
 from PIL import Image
 from babel import Locale
@@ -366,7 +367,10 @@ class Chart(object):
         self.ax.plot([0], transform=self.ax.transAxes, **kwargs)
 
     def _set_date_ticks(self, dates):
-        """ Set x ticks and formatters for chart types working on date series """
+        """
+            Set x ticks and formatters for chart types working on date series.
+            Todo: Unify location setting, to be able to support max_ticks everywhere.
+        """
 
         # Number of days on x axis (Matplotlib will use days as unit here)
         xmin, xmax = to_date(self.data.x_points[0]), to_date(self.data.x_points[-1])
@@ -377,9 +381,31 @@ class Chart(object):
             self.ax.set_xticks([x[0] for x in self.ticks])
             self.ax.set_xticklabels([x[1] for x in self.ticks])
 
+        elif self.interval == "decennial":
+            # Get the intervall needed to stay below max_ticks
+            i = 1
+            while len(dates) / i > self.max_ticks:
+                i += 1
+            loc = YearLocator(10 * i)
+            # loc = get_best_locator(delta, len(dates), self.interval)
+            self.ax.xaxis.set_major_locator(loc)
+
+            formatter = Formatter(self._language)
+
+            def fmt(x, pos):
+                d = num2date(x).isoformat()[:10]
+                # 9 years later
+                d2 = str(int(d[:4]) + 9) + d[4:]
+                if len(self.data.x_points) > 7:
+                    return formatter.date(d, "yy") + "–" + formatter.date(d2, "yy")
+                else:
+                    return formatter.date(d, "y") + "–" + formatter.date(d2, "yy")
+            self.ax.xaxis.set_major_formatter(fmt)
+
         elif delta.days > 500:
             ticks = get_year_ticks(xmin, xmax, max_ticks=self.max_ticks)
             self.ax.set_xticks(ticks)
+
             self.ax.xaxis.set_major_formatter(DateFormatter('%Y'))
 
         else:
@@ -667,6 +693,7 @@ class Chart(object):
                 'Creator': f"NWCharts {__version__}",
             }
             """
+
         self._fig.savefig(buf, **args)  # , bbox_inches="tight")
         buf.seek(0)
         self._storage.save(key, buf, img_format, storage_options)

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/newsworthycharts/lib/locator.py

@@ -42,7 +42,10 @@ def get_best_locator(delta, points, interval=None):
     trying to keep the x axis as clean as possible, while still including
     enough clues for the reader to easily understand the graph.
     """
-    if delta.days > 365 * 150:
+    if interval == "decennial":
+        # Set one tick every 10 years
+        return YearLocator(10)
+    elif delta.days > 365 * 150:
         return YearLocator(100)
     elif delta.days > 365 * 45:
         return YearLocator(20)

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/newsworthycharts/lib/utils.py

@@ -163,15 +163,21 @@ def outline(color="white", linewidth=3, **kwargs):
 
 def guess_date_interval(data):
     """Return a probable interval, e.g. "montly", given current data."""
-    interval = "yearly"
+    interval = "decennial"
     for serie in data:
         dates = [to_date(x[0]) for x in serie]
         years = [x.year for x in dates]
+
+        # Are there decades with more than one year?
+        if len(years) > len(set(years)):
+            interval = "yearly"
+
         months = [x.month for x in dates]
         yearmonths = [x.strftime("%Y-%m") for x in dates]
         weeks = [str(x.year) + str(x.isocalendar()[1]) for x in dates]
+
         if len(years) > len(set(years)):
-            # there are years with more than one point
+            # Are there years with more than one point?
             unique_months = sorted(list(set(months)))
             if len(unique_months) == 4 \
                     and unique_months[0] + 3 == unique_months[1] \

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/newsworthycharts/scatterplot.py

@@ -47,7 +47,7 @@ class ScatterPlot(Chart):
 
         # hard coded max number of ticks for now
         # consider dynamic/more clever approach
-        max_ticks = 5
+        max_ticks = 7
         self.ax.yaxis.set_major_locator(MaxNLocator(nbins=max_ticks))
         self.ax.xaxis.set_major_locator(MaxNLocator(nbins=max_ticks))
 

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/newsworthycharts/serialchart.py

@@ -34,7 +34,7 @@ class SerialChart(Chart):
         # Set with of lines explicitly (otherwise determined by style file)
         self.line_width = None
 
-        self.max_ticks = 7
+        self.max_ticks = 10
 
         # Manually set tick locations and labels? Provide a list of tuples:
         # [(2013-01-01, "-13"), (2014-01-01, "-14"), (2015-01-01, "-15")]
@@ -73,7 +73,8 @@ class SerialChart(Chart):
         self._ymax = val
 
     def _days_in(self, interval, d=None):
-        """Return number of days in a given period.
+        """
+        Return number of days in a given period. This is used to set bar widths, so approximate is fine.
 
         If only interval is given, use a typical number of days.
         >>>> _days_in(monthly)
@@ -83,6 +84,7 @@ class SerialChart(Chart):
         """
         if d is None:
             return {
+                'decennial': 3652,
                 'yearly': 365,
                 'quarterly': 91,
                 'monthly': 30,
@@ -109,6 +111,10 @@ class SerialChart(Chart):
                 return 7
             elif interval == "daily":
                 return 1
+            elif interval == "decennial":
+                return (
+                    (d + relativedelta(years=10)).replace(day=1, month=1) - d.replace(day=1, month=1)
+                ).days
 
     def _get_annotation_direction(self, index, values):
         """ Given an index and series of values, provide the estimated best
@@ -266,7 +272,7 @@ class SerialChart(Chart):
                                          marker='.',
                                          zorder=12)
 
-                if len(self.labels) > i:
+                if len(self.labels) > i and any([x[1] for x in serie]):
                     line.set_label(self.labels[i])
 
                 if self.label_placement == "line":
@@ -284,11 +290,14 @@ class SerialChart(Chart):
 
                 # add highlight marker
                 if highlight_value:
-                    self.ax.plot(highlight_date, highlight_value,
-                                 c=color,
-                                 marker='o',
-                                 markersize=5,
-                                 zorder=zo)
+                    self.ax.plot(
+                        highlight_date,
+                        highlight_value,
+                        c=color,
+                        marker='o',
+                        markersize=5,
+                        zorder=zo,
+                    )
 
             elif self.type[i] == "bars":
                 # Put first series on top
@@ -381,7 +390,7 @@ class SerialChart(Chart):
                 bars = self.ax.bar(dates, values, **bar_kwargs)
                 bar_elems.append(bars)
 
-                if len(self.labels) > i:
+                if len(self.labels) > i and any([x[1] for x in serie]):
                     bars.set_label(self.labels[i])
 
             # Add annotations

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.61.4
+Version: 1.63.0
 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.61.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.63.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -18,11 +18,11 @@ Requires-Dist: PyYAML>=3
 Requires-Dist: adjustText==0.7.3
 Requires-Dist: numpy>2
 Requires-Dist: python-dateutil<3,>=2
-Requires-Dist: Pillow==10.4.0
+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.6.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.
@@ -154,13 +154,13 @@ These settings are available for all chart types:
 
 **SerialChart**
 
-- type = 'line'  # line|bar|stacked_bar
+- type = 'line'  # line|bars
 - bar_width = 0.9  # percent of data point width
 - allow_broken_y_axis = True|False  # default depends on chart type
 - baseline = 0  # The “zero” line. Useful for plotting deviations, e.g. temperatures above/below mean
 - baseline_annotation = None  # A label for the baseline
 - line_width = None  # To override style settings
-- max_ticks = 7  # Maximum number of ticks on the x axis
+- max_ticks = 10  # Maximum number of ticks on the x axis. *Only used with yearly|decennial data* (this is yet to be fixed)
 - ticks = None  # Custom ticks on the x axis, as a list of lists or tuples: `[(2013-01-01, "-13"), (2014-01-01, "-14"), (2015-01-01, "-15")]`
 - ymin = None  # Minimum value on y axis. If None, it will be calculated from data
 - ymax = None  # Maximum value on y axis. If None, it will be calculated from data
@@ -248,11 +248,21 @@ Roadmap
   - Remove custom charts (add missing api interfaces to Chart class instead)
   - Remove DataWrapper class (out-of-scope)
   - Custom month locator with equal-width month bars
-  - Add color-ramp choropleth maps, as an alternative to binning
 
 Changelog
 ---------
 
+- 1.63.0
+
+  - Added `interval: decennial` to SerialChart. Will be autodetected if all data points are 10 years apart.
+  - Pillow==11.0.0
+  - mapclassify==2.8.1
+
+- 1.62.0
+
+  - max_ticks default is now 10 in SerialChart and 7 in ScatterPlot
+  - Don't print legend labels for empty series
+
 - 1.61.4
 
   - Make sure y axis and/or baseline is in front of bar padding

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/newsworthycharts.egg-info/requires.txt

@@ -6,9 +6,9 @@ PyYAML>=3
 adjustText==0.7.3
 numpy>2
 python-dateutil<3,>=2
-Pillow==10.4.0
+Pillow==11.0.0
 requests>=2.22
 matplotlib-label-lines==0.5.1
 geopandas>=1
-mapclassify==2.6.1
+mapclassify==2.8.1
 puremagic>=1

{newsworthycharts-1.61.4 → newsworthycharts-1.63.0}/setup.py

@@ -32,11 +32,11 @@ setup(
         "adjustText==0.7.3",
         "numpy>2",
         "python-dateutil>=2,<3",
-        "Pillow==10.4.0",
+        "Pillow==11.0.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
         "geopandas>=1",
-        "mapclassify==2.6.1",
+        "mapclassify==2.8.1",
         "puremagic>=1",
     ],
     setup_requires=["flake8"],