newsworthycharts 1.76.0__py3-none-any.whl → 1.76.2__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -18,7 +18,7 @@ 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, YearLocator
+from matplotlib.dates import DateFormatter, num2date, date2num, YearLocator
 
 from langcodes import standardize_tag
 from PIL import Image
@@ -420,17 +420,36 @@ class Chart(object):
 
         else:
             loc = get_best_locator(delta, len(dates), self.interval, max_ticks=self.max_ticks)
+            print(loc)
             self.ax.xaxis.set_major_locator(loc)
             formatter = Formatter(self._language)
 
+            if self.interval == "weekly" and delta.days > 90:
+                # custom locator _and_ ticks: Put month label on start of each new month
+                # only the first occurance of each month
+                _loc_ticks = [
+                    date2num(to_date(x)) for (i, x) in enumerate(self.data.x_points)
+                    if i == 0 or x[5:7] != self.data.x_points[i - 1][5:7]
+                ]
+                import matplotlib.ticker as ticker
+                loc = ticker.FixedLocator(_loc_ticks)
+                self.ax.xaxis.set_major_locator(loc)
+
+                def fmt(x, pos):
+                    d = num2date(x).isoformat()[:10]
+                    if pos and self.data.x_points[pos - 1][0:4] != self.data.x_points[pos][0:4]:
+                        return formatter.date(d, "MMM y")
+                    else:
+                        return formatter.date(d, "MMM")
             # if isinstance(loc, WeekdayLocator):
-            if self.interval == "weekly":
+            elif self.interval == "weekly":
                 # We consider dates to be more informative than week numbers
                 def fmt(x, pos):
+                    d = num2date(x).isoformat()[:10]
                     if pos > len(self.data.x_points):
                         return None
                     try:
-                        return formatter.date(self.data.x_points[pos], "d MMM")
+                        return formatter.date(d, "d MMM")
                     except IndexError:
                         return None
                 # fmt = DateFormatter('%-d %b')

{newsworthycharts-1.76.0.dist-info → newsworthycharts-1.76.2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.76.0
+Version: 1.76.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.76.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.76.2.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,7 +11,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.10.3
+Requires-Dist: matplotlib==3.10.6
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
@@ -287,6 +287,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.76.2
+
+  - Use custom locator for crowded weekly data
+  - matplotlib==3.10.6
+
+- 1.76.1
+
+  - Fixed a bug where x axis labels would sometimes get mixed up in long weekly data series
+
 - 1.76.0
 
   - Pillow==11.3.0

{newsworthycharts-1.76.0.dist-info → newsworthycharts-1.76.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=1Ot5ucxJ17wa-7yxakr0e-G-xpRHzFVw7mVYbMb8-18,1221
+newsworthycharts/__init__.py,sha256=xLQdIOkQXmWVDGTLvbSD9--qBkoCucP41TOweTP5Pys,1221
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=Vr-0yFms0hEVCeUa3vLt3FYBqpX4xLQ8YGPc4LGQN_A,18368
-newsworthycharts/chart.py,sha256=QDvIo_HV9fDmadBKLsPJMXrIYL6ZbHnDbVjZuzX9Srw,35441
+newsworthycharts/chart.py,sha256=yNGqPk8fWijIQ9EpYg3ANfi7pNldrN3RyjaP3NxF0yU,36405
 newsworthycharts/choroplethmap.py,sha256=3ztB8C0Pm9yUvPucnsRgmdPmnlCxvkiB42JuSOJmWSk,9834
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=tECE7bZhJnvJxFV2pSitDxaHrKOwjBjoSA15H-MdzeI,6123
@@ -29,8 +29,8 @@ newsworthycharts/rc/newsworthy,sha256=yOIZvYS6PG1u19VMcdtfj9vbihKQsey5IprwqK59Kg
 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.76.0.dist-info/licenses/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.76.0.dist-info/METADATA,sha256=Cl5xD_75FXkccbJ5s_2rVX-KmC1gqlnhpIChH70q6h4,35699
-newsworthycharts-1.76.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-newsworthycharts-1.76.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.76.0.dist-info/RECORD,,
+newsworthycharts-1.76.2.dist-info/licenses/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.76.2.dist-info/METADATA,sha256=5UazmLqY83MHFvSj3ruF7TmMyYsSNLR1w1Dic4w0z2o,35883
+newsworthycharts-1.76.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+newsworthycharts-1.76.2.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.76.2.dist-info/RECORD,,