newsworthycharts 1.68.1__tar.gz → 1.70.0__tar.gz

{newsworthycharts-1.68.1/newsworthycharts.egg-info → newsworthycharts-1.70.0}/PKG-INFO

@@ -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 → newsworthycharts-1.70.0}/README.rst

@@ -181,6 +181,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 _
@@ -232,6 +234,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 → newsworthycharts-1.70.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.68.1 → newsworthycharts-1.70.0}/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 → newsworthycharts-1.70.0/newsworthycharts.egg-info}/PKG-INFO

@@ -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 → newsworthycharts-1.70.0}/newsworthycharts.egg-info/requires.txt

@@ -1,14 +1,13 @@
 boto3>=1.26
-matplotlib==3.9.3
+matplotlib==3.10.0
 langcodes>=3.3
 Babel<3,>=2.14.0
 PyYAML>=3
 adjustText==0.7.3
 numpy>2
 python-dateutil<3,>=2
-Pillow==11.0.0
+Pillow==11.1.0
 requests>=2.22
 matplotlib-label-lines==0.5.1
 geopandas>=1
 mapclassify==2.8.1
-puremagic>=1

{newsworthycharts-1.68.1 → newsworthycharts-1.70.0}/setup.py

@@ -25,19 +25,18 @@ setup(
     python_requires='>=3.9',
     install_requires=[
         "boto3>=1.26",
-        "matplotlib==3.9.3",
+        "matplotlib==3.10.0",
         "langcodes>=3.3",
         "Babel>=2.14.0,<3",
         "PyYAML>=3",
         "adjustText==0.7.3",
         "numpy>2",
         "python-dateutil>=2,<3",
-        "Pillow==11.0.0",
+        "Pillow==11.1.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
         "geopandas>=1",
         "mapclassify==2.8.1",
-        "puremagic>=1",
     ],
     setup_requires=["flake8"],
     include_package_data=True,