newsworthycharts 1.73.1__tar.gz → 1.73.3__tar.gz

{newsworthycharts-1.73.1/newsworthycharts.egg-info → newsworthycharts-1.73.3}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.73.1
+Version: 1.73.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.73.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.3.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.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.10.1
+Requires-Dist: matplotlib==3.10.3
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
@@ -23,6 +23,17 @@ Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
 Requires-Dist: geopandas==1.0.1
 Requires-Dist: mapclassify==2.8.1
+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.
 
@@ -273,6 +284,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.73.3
+
+  - Remove space around endash in legend title for unitless choropleth maps
+  - matplotlib==3.10.3
+
+- 1.73.2
+
+  - Fix month locator bug for very short series
+
 - 1.73.1
 
   - More leniant label parsing in ChoroplethMap

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3}/README.rst

@@ -247,6 +247,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.73.3
+
+  - Remove space around endash in legend title for unitless choropleth maps
+  - matplotlib==3.10.3
+
+- 1.73.2
+
+  - Fix month locator bug for very short series
+
 - 1.73.1
 
   - More leniant label parsing in ChoroplethMap

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3}/newsworthycharts/__init__.py

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

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3}/newsworthycharts/choroplethmap.py

@@ -140,9 +140,15 @@ class ChoroplethMap(Map):
                 if binning.counts[idx] == 1:
                     txt_val = fmt(cat)
                 elif idx == 0:
-                    txt_val = f"– {fmt(cat)}"
+                    if self.units == "number":
+                        txt_val = f"–{fmt(cat)}"
+                    else:
+                        txt_val = f"– {fmt(cat)}"
                 else:
-                    txt_val = f"{fmt(binning.bins[idx - 1])} – {fmt(cat)}"
+                    if self.units == "number":
+                        txt_val = f"{fmt(binning.bins[idx - 1])}–{fmt(cat)}"
+                    else:
+                        txt_val = f"{fmt(binning.bins[idx - 1])} – {fmt(cat)}"
                 patches.append(mpatches.Patch(color=mapper.to_rgba(cat), label=txt_val))
 
         elif self.categorical:

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3}/newsworthycharts/lib/locator.py

@@ -1,6 +1,6 @@
 """ Custom locators and related methods
 """
-from matplotlib.dates import (YearLocator, DayLocator,
+from matplotlib.dates import (YearLocator, DayLocator, MonthLocator,
                               WeekdayLocator, AutoDateLocator)
 import matplotlib.dates as mdates
 
@@ -63,9 +63,12 @@ def get_best_locator(delta, points, interval=None, max_ticks=None):
     else:
         # Less than a year:
         if interval in ["monthly", "quarterly"]:
+            if points < max_ticks:
+                return MonthLocator()
             locator = AutoDateLocator(maxticks=max_ticks)
+            _month_intervals = [1, 2, 3, 6]
             locator.intervald = {
-                mdates.MONTHLY: [1, 2, 3, 4, 6],  # only allow monthly intervals
+                mdates.MONTHLY: _month_intervals,  # only allow monthly intervals
             }
             return locator
             # return MonthLocator()
@@ -87,11 +90,11 @@ def get_best_locator(delta, points, interval=None, max_ticks=None):
         elif interval == "daily" or interval is None:
             if delta.days > 30:
                 locator = AutoDateLocator(maxticks=max_ticks)
+                _month_intervals = [1, 2, 3, 6]
                 locator.intervald = {
-                    mdates.MONTHLY: [1, 2, 3, 4, 6],  # only allow monthly intervals
+                    mdates.MONTHLY: _month_intervals,  # only allow monthly intervals
                 }
                 return locator
-                # return MonthLocator()
             elif delta.days > 21:
                 return DayLocator(interval=10)
             elif delta.days > 7:

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3}/newsworthycharts/serialchart.py

@@ -633,6 +633,11 @@ class SerialChart(Chart):
         if ymin > self.baseline and self.allow_broken_y_axis:
             self._mark_broken_axis()
 
+        """
+        if all([x == "markers" for x in self.type]):
+            # ....
+        else:
+        """
         self._set_date_ticks(dates)
 
         # Add labels in legend if there are multiple series, otherwise

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.73.1
+Version: 1.73.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.73.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.3.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.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.10.1
+Requires-Dist: matplotlib==3.10.3
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
@@ -23,6 +23,17 @@ Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
 Requires-Dist: geopandas==1.0.1
 Requires-Dist: mapclassify==2.8.1
+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.
 
@@ -273,6 +284,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.73.3
+
+  - Remove space around endash in legend title for unitless choropleth maps
+  - matplotlib==3.10.3
+
+- 1.73.2
+
+  - Fix month locator bug for very short series
+
 - 1.73.1
 
   - More leniant label parsing in ChoroplethMap

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3}/newsworthycharts.egg-info/requires.txt

@@ -1,5 +1,5 @@
 boto3>=1.26
-matplotlib==3.10.1
+matplotlib==3.10.3
 langcodes>=3.3
 Babel<3,>=2.14.0
 PyYAML>=3

{newsworthycharts-1.73.1 → newsworthycharts-1.73.3}/setup.py

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