newsworthycharts 1.68.1__py3-none-any.whl → 1.70.0__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/choroplethmap.py

@@ -26,6 +26,7 @@ class ChoroplethMap(Map):
 
     def __init__(self, *args, **kwargs):
         super(ChoroplethMap, self).__init__(*args, **kwargs)
+        self.label_order = kwargs.get("label_order", None)
 
     def _add_data(self):
 
@@ -143,7 +144,9 @@ class ChoroplethMap(Map):
 
             # Geopandas does not handle legend if color keyword is used
             # We need to add it ourselves
-            for label, color in color_map.items():
+            label_order = self.label_order or color_map.keys()
+            for label in reversed(label_order):
+                color = color_map[label]
                 # A bit of an hack:
                 # Check if this corresponds to one of our predefined
                 # color names:

{newsworthycharts-1.68.1.dist-info → newsworthycharts-1.70.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.68.1
+Version: 1.70.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.68.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.70.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,19 +11,18 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3 >=1.26
-Requires-Dist: matplotlib ==3.9.3
+Requires-Dist: matplotlib ==3.10.0
 Requires-Dist: langcodes >=3.3
 Requires-Dist: Babel <3,>=2.14.0
 Requires-Dist: PyYAML >=3
 Requires-Dist: adjustText ==0.7.3
 Requires-Dist: numpy >2
 Requires-Dist: python-dateutil <3,>=2
-Requires-Dist: Pillow ==11.0.0
+Requires-Dist: Pillow ==11.1.0
 Requires-Dist: requests >=2.22
 Requires-Dist: matplotlib-label-lines ==0.5.1
 Requires-Dist: geopandas >=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.
 
@@ -208,6 +207,8 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
 
 _ Inherits from Map _
 
+  - `label_order` = None  # A list of categorical values, to control the order of the labels in the legend
+
 **BubbleMap**
 
 _ Inherits from Map _
@@ -259,6 +260,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.70.0
+
+  - Pillow==11.1.0 (possibly faster png rendering)
+  - Matplotlib==3.10.0 (no known changes affecting us)
+  - Remove puremagic from setup requirements (only used in testing)
+
+- 1.69.0
+
+  - New `label_order` argument in ChoroplethMap
+
 - 1.68.1
 
   - Fixed crash in `ChoroplethMap` with non-numerical values

{newsworthycharts-1.68.1.dist-info → newsworthycharts-1.70.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-newsworthycharts/__init__.py,sha256=F3SsT4qDwn9ebj33Gty_CWJGsedd0eN8EtF3MDZmRvM,1160
+newsworthycharts/__init__.py,sha256=MxUuXTGoHiIb02qpqT9Sdp9MPvODq0VTPVJSU_qw4o4,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=YL3pzq8a7U5F0MpeRIAEwCAHw1BRDyKjoaAhf-UyRDo,18179
 newsworthycharts/chart.py,sha256=jurOkIrm8TRpuL-Fj0AdBJXmjrdkZ-U2w_TaOysQvAs,34489
-newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
+newsworthycharts/choroplethmap.py,sha256=Si-01213rWqDKINkhmKV6x5iSMumQveJfrlCnqYcIJM,8173
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
@@ -28,8 +28,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.68.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.68.1.dist-info/METADATA,sha256=-IKPmEFJ4voMBH5obNcNZz_tcu3XShDR4e4SNuzjBzY,31487
-newsworthycharts-1.68.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.68.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.68.1.dist-info/RECORD,,
+newsworthycharts-1.70.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.70.0.dist-info/METADATA,sha256=0Silk18RHi0iuiE-fvwDJhTMFeZFNuildojkWY3Of4w,31811
+newsworthycharts-1.70.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.70.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.70.0.dist-info/RECORD,,