newsworthycharts 1.74.2__tar.gz → 1.76.0__tar.gz

{newsworthycharts-1.74.2/newsworthycharts.egg-info → newsworthycharts-1.76.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.74.2
+Version: 1.76.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.74.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.76.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
@@ -18,11 +18,11 @@ Requires-Dist: PyYAML>=3
 Requires-Dist: adjustText==1.3.0
 Requires-Dist: numpy>2
 Requires-Dist: python-dateutil<3,>=2
-Requires-Dist: Pillow==11.2.1
+Requires-Dist: Pillow==11.3.0
 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
+Requires-Dist: geopandas==1.1.1
+Requires-Dist: mapclassify==2.10.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -225,6 +225,7 @@ These settings are available for all chart types:
 - `categorical` = False  # If True, the map will be colored by category. If False, it will be colored by a continuous value
 - `base_map` = None
 - `missing_label` = None  # Add a label for no data
+- `missing_color` = "gainsboro"  # Color for regions with no data
 
 `basemap` can be `{ISO}-{level}` or `{ISO}|{subset}-{level}`. 
 For example, `se-4` will show Swedish counties, while `se|03-7` will show municipalities (`se-7`) starting with `03`.
@@ -281,10 +282,22 @@ 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
+  - TODO: avif support
 
 Changelog
 ---------
 
+- 1.76.0
+
+  - Pillow==11.3.0
+  - Minimum required Python version is now 3.10
+  - Minor fixes to weekly serial chart x axis
+
+- 1.75.0
+
+  - geopandas==1.1.0
+  - Added `missing_color` argument to ChoroplethMap, to set the color of regions with no data
+
 - 1.74.2
 
   - Improved positioning of x-range annotations in SerialChart

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/README.rst

@@ -188,6 +188,7 @@ These settings are available for all chart types:
 - `categorical` = False  # If True, the map will be colored by category. If False, it will be colored by a continuous value
 - `base_map` = None
 - `missing_label` = None  # Add a label for no data
+- `missing_color` = "gainsboro"  # Color for regions with no data
 
 `basemap` can be `{ISO}-{level}` or `{ISO}|{subset}-{level}`. 
 For example, `se-4` will show Swedish counties, while `se|03-7` will show municipalities (`se-7`) starting with `03`.
@@ -244,10 +245,22 @@ 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
+  - TODO: avif support
 
 Changelog
 ---------
 
+- 1.76.0
+
+  - Pillow==11.3.0
+  - Minimum required Python version is now 3.10
+  - Minor fixes to weekly serial chart x axis
+
+- 1.75.0
+
+  - geopandas==1.1.0
+  - Added `missing_color` argument to ChoroplethMap, to set the color of regions with no data
+
 - 1.74.2
 
   - Improved positioning of x-range annotations in SerialChart

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/newsworthycharts/choroplethmap.py

@@ -33,6 +33,10 @@ class ChoroplethMap(Map):
 
         df = self._prepare_map_data()
 
+        missing_color = "gainsboro"
+        if self.missing_color:
+            missing_color = self.missing_color
+
         args = {
             "categorical": True,
             "legend": True,  # bug in geopandas, fixed in master but not released
@@ -43,7 +47,7 @@ class ChoroplethMap(Map):
             "edgecolor": "white",
             "linewidth": 0.2,
             "missing_kwds": {
-                "color": "gainsboro",
+                "color": missing_color,
             },
         }
         # This should be adjusted per basemap
@@ -58,8 +62,8 @@ class ChoroplethMap(Map):
             # normalize the data ourselves, otherwise the inset maps will be off
             norm = mpl.colors.Normalize(vmin=df["data"].min(), vmax=df["data"].max())
             mapper = mpl.cm.ScalarMappable(norm=norm, cmap=self.color_ramp)
-            df["color"] = df["data"].apply(lambda x: mapper.to_rgba(x) if not np.isnan(x) else "gainsboro")
-            df["color"] = df["color"].fillna("gainsboro")
+            df["color"] = df["data"].apply(lambda x: mapper.to_rgba(x) if not np.isnan(x) else missing_color)
+            df["color"] = df["color"].fillna(missing_color)
             args["color"] = df["color"]
 
             self._fig.tight_layout()
@@ -129,8 +133,8 @@ class ChoroplethMap(Map):
             # normalize the data ourselves, otherwise the inset maps will be off
             norm = mpl.colors.Normalize(vmin=_has_value["data"].min(), vmax=_has_value["data"].max())
             mapper = mpl.cm.ScalarMappable(norm=norm, cmap=self.color_ramp)
-            df["color"] = df["data"].apply(lambda x: mapper.to_rgba(x) if not np.isnan(x) else "gainsboro")
-            df["color"] = df["color"].fillna("gainsboro")
+            df["color"] = df["data"].apply(lambda x: mapper.to_rgba(x) if not np.isnan(x) else missing_color)
+            df["color"] = df["color"].fillna(missing_color)
             args["color"] = df["color"]
 
             # Add labels legend (manually, Geopandas is too crude as of now)
@@ -173,7 +177,7 @@ class ChoroplethMap(Map):
                 for idx, cat in enumerate(cat):
                     color_map[cat] = self._nwc_style["qualitative_colors"][idx]
             df["color"] = df["data"].astype(str).map(color_map)
-            df["color"] = df["color"].fillna("gainsboro")
+            df["color"] = df["color"].fillna(missing_color)
             args["color"] = df["color"]
 
             # Geopandas does not handle legend if color keyword is used
@@ -195,7 +199,7 @@ class ChoroplethMap(Map):
                 patches.append(patch)
         patches = list(reversed(patches))
         if self.missing_label and len(patches):
-            patches.append(mpatches.Patch(color="gainsboro", label=self.missing_label))
+            patches.append(mpatches.Patch(color=missing_color, label=self.missing_label))
 
         df.plot(ax=self.ax, **args)
         # Add outer edge
@@ -231,8 +235,8 @@ class ChoroplethMap(Map):
                 ax=axin,
                 **args,
             )
-            r, (a, b, c, d) = self.ax.indicate_inset_zoom(axin)
-            for _line in [a, b, c, d]:
+            artist = self.ax.indicate_inset_zoom(axin)
+            for _line in artist.connectors:
                 _line.set_visible(False)
 
         if len(patches):

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/newsworthycharts/lib/locator.py

@@ -75,13 +75,13 @@ def get_best_locator(delta, points, interval=None, max_ticks=None):
 
         elif interval == "weekly":
             # NB The threshold are not tested thoroughly. Consider adjusting.
-            if delta.days <= 10 * 7:
+            if delta.days <= 9 * 7:
                 return WeekdayLocator(MO, interval=1)
 
-            elif delta.days <= 20 * 7:
+            elif delta.days <= 18 * 7:
                 return WeekdayLocator(MO, interval=2)
 
-            elif delta.days <= 30 * 7:
+            elif delta.days <= 27 * 7:
                 return WeekdayLocator(MO, interval=3)
 
             else:

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/newsworthycharts/map.py

@@ -94,6 +94,7 @@ class Map(Chart):
         self.categorical = kwargs.get("categorical", False)
         self.base_map = None
         self.missing_label = None
+        self.missing_color = None
         self.df = None
         self.show_ticks = False
 

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/newsworthycharts/serialchart.py

@@ -253,7 +253,7 @@ class SerialChart(Chart):
                         lm = "-"
                     if lw is None:
                         lw = self._nwc_style.get("lines.linewidth", 2)
-        
+
                 if hasattr(self, "_get_line_colors"):
                     # Hook for sub classes
                     color = self._get_line_colors(i)

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.74.2
+Version: 1.76.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.74.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.76.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
@@ -18,11 +18,11 @@ Requires-Dist: PyYAML>=3
 Requires-Dist: adjustText==1.3.0
 Requires-Dist: numpy>2
 Requires-Dist: python-dateutil<3,>=2
-Requires-Dist: Pillow==11.2.1
+Requires-Dist: Pillow==11.3.0
 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
+Requires-Dist: geopandas==1.1.1
+Requires-Dist: mapclassify==2.10.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -225,6 +225,7 @@ These settings are available for all chart types:
 - `categorical` = False  # If True, the map will be colored by category. If False, it will be colored by a continuous value
 - `base_map` = None
 - `missing_label` = None  # Add a label for no data
+- `missing_color` = "gainsboro"  # Color for regions with no data
 
 `basemap` can be `{ISO}-{level}` or `{ISO}|{subset}-{level}`. 
 For example, `se-4` will show Swedish counties, while `se|03-7` will show municipalities (`se-7`) starting with `03`.
@@ -281,10 +282,22 @@ 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
+  - TODO: avif support
 
 Changelog
 ---------
 
+- 1.76.0
+
+  - Pillow==11.3.0
+  - Minimum required Python version is now 3.10
+  - Minor fixes to weekly serial chart x axis
+
+- 1.75.0
+
+  - geopandas==1.1.0
+  - Added `missing_color` argument to ChoroplethMap, to set the color of regions with no data
+
 - 1.74.2
 
   - Improved positioning of x-range annotations in SerialChart

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/newsworthycharts.egg-info/requires.txt

@@ -6,8 +6,8 @@ PyYAML>=3
 adjustText==1.3.0
 numpy>2
 python-dateutil<3,>=2
-Pillow==11.2.1
+Pillow==11.3.0
 requests>=2.22
 matplotlib-label-lines==0.5.1
-geopandas==1.0.1
-mapclassify==2.8.1
+geopandas==1.1.1
+mapclassify==2.10.0

{newsworthycharts-1.74.2 → newsworthycharts-1.76.0}/setup.py

@@ -22,7 +22,7 @@ setup(
     license="MIT",
     packages=["newsworthycharts"],
     zip_safe=False,
-    python_requires='>=3.9',
+    python_requires='>=3.10',
     install_requires=[
         "boto3>=1.26",
         "matplotlib==3.10.3",
@@ -32,11 +32,11 @@ setup(
         "adjustText==1.3.0",
         "numpy>2",
         "python-dateutil>=2,<3",
-        "Pillow==11.2.1",
+        "Pillow==11.3.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
-        "geopandas==1.0.1",
-        "mapclassify==2.8.1",
+        "geopandas==1.1.1",
+        "mapclassify==2.10.0",
     ],
     setup_requires=["flake8"],
     include_package_data=True,