newsworthycharts 1.76.1__tar.gz → 1.76.2__tar.gz

{newsworthycharts-1.76.1/newsworthycharts.egg-info → newsworthycharts-1.76.2}/PKG-INFO

@@ -1,15 +1,39 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.76.1
+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.1.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
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: boto3>=1.26
+Requires-Dist: matplotlib==3.10.6
+Requires-Dist: langcodes>=3.3
+Requires-Dist: Babel<3,>=2.14.0
+Requires-Dist: PyYAML>=3
+Requires-Dist: adjustText==1.3.0
+Requires-Dist: numpy>2
+Requires-Dist: python-dateutil<3,>=2
+Requires-Dist: Pillow==11.3.0
+Requires-Dist: requests>=2.22
+Requires-Dist: matplotlib-label-lines==0.5.1
+Requires-Dist: geopandas==1.1.1
+Requires-Dist: mapclassify==2.10.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -263,6 +287,11 @@ 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

{newsworthycharts-1.76.1 → newsworthycharts-1.76.2}/README.rst

@@ -250,6 +250,11 @@ 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

{newsworthycharts-1.76.1 → newsworthycharts-1.76.2}/newsworthycharts/__init__.py

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

{newsworthycharts-1.76.1 → newsworthycharts-1.76.2}/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,11 +420,29 @@ 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]

{newsworthycharts-1.76.1 → newsworthycharts-1.76.2/newsworthycharts.egg-info}/PKG-INFO

@@ -1,15 +1,39 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.76.1
+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.1.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
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: boto3>=1.26
+Requires-Dist: matplotlib==3.10.6
+Requires-Dist: langcodes>=3.3
+Requires-Dist: Babel<3,>=2.14.0
+Requires-Dist: PyYAML>=3
+Requires-Dist: adjustText==1.3.0
+Requires-Dist: numpy>2
+Requires-Dist: python-dateutil<3,>=2
+Requires-Dist: Pillow==11.3.0
+Requires-Dist: requests>=2.22
+Requires-Dist: matplotlib-label-lines==0.5.1
+Requires-Dist: geopandas==1.1.1
+Requires-Dist: mapclassify==2.10.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -263,6 +287,11 @@ 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

{newsworthycharts-1.76.1 → newsworthycharts-1.76.2}/newsworthycharts.egg-info/requires.txt

@@ -1,13 +1,13 @@
+boto3>=1.26
+matplotlib==3.10.6
+langcodes>=3.3
 Babel<3,>=2.14.0
-Pillow==11.3.0
 PyYAML>=3
 adjustText==1.3.0
-boto3>=1.26
-geopandas==1.1.1
-langcodes>=3.3
-mapclassify==2.10.0
-matplotlib-label-lines==0.5.1
-matplotlib==3.10.3
 numpy>2
 python-dateutil<3,>=2
+Pillow==11.3.0
 requests>=2.22
+matplotlib-label-lines==0.5.1
+geopandas==1.1.1
+mapclassify==2.10.0

{newsworthycharts-1.76.1 → newsworthycharts-1.76.2}/setup.py

@@ -25,7 +25,7 @@ setup(
     python_requires='>=3.10',
     install_requires=[
         "boto3>=1.26",
-        "matplotlib==3.10.3",
+        "matplotlib==3.10.6",
         "langcodes>=3.3",
         "Babel>=2.14.0,<3",
         "PyYAML>=3",