newsworthycharts 1.54.4__py3-none-any.whl → 1.54.5__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/lib/locator.py

@@ -79,7 +79,10 @@ def get_best_locator(delta, points, interval=None):
 
         elif interval == "daily" or interval is None:
             if delta.days > 30:
-                # FIXME dont print every month
                 return MonthLocator()
+            elif delta.days > 21:
+                return DayLocator(interval=10)
+            elif delta.days > 7:
+                return DayLocator(interval=5)
             else:
                 return DayLocator()

{newsworthycharts-1.54.4.dist-info → newsworthycharts-1.54.5.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.54.4
+Version: 1.54.5
 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.54.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.54.5.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,15 +11,15 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: Babel <3,>=2.14.0
-Requires-Dist: Pillow ==10.1.0
+Requires-Dist: Pillow ==10.2.0
 Requires-Dist: PyYAML >=3
 Requires-Dist: adjustText ==0.7.3
 Requires-Dist: boto3 >=1.26
-Requires-Dist: geopandas ==0.14.1
+Requires-Dist: geopandas ==0.14.3
 Requires-Dist: langcodes >=3.3
 Requires-Dist: mapclassify ==2.6.1
 Requires-Dist: matplotlib-label-lines ==0.5.1
-Requires-Dist: matplotlib ==3.8.2
+Requires-Dist: matplotlib ==3.8.3
 Requires-Dist: numpy <2,>=1.21.0
 Requires-Dist: python-dateutil <3,>=2
 Requires-Dist: requests >=2.22
@@ -181,6 +181,11 @@ Roadmap
 Changelog
 ---------
 
+- 1.54.5
+
+  - Improved tick placement in daily charts
+  - Minor upgrades: matplotlib==3.8.3; Pillow==10.2.0; geopandas==0.14.3
+
 - 1.54.4
 
   - Use Babel 2.14, and pin version
@@ -213,7 +218,7 @@ Changelog
 - 1.53.0
 
   - Fixed bug in value_labels, trying to access a color value that didn't exist
-  - Dropped Python 3.7 support (upstream)
+  - Dropped Python 3.8 support (upstream)
   - Uses Matplotlib 3.8
   - Uses Pillow 10
 

{newsworthycharts-1.54.4.dist-info → newsworthycharts-1.54.5.dist-info}/RECORD

@@ -1,21 +1,16 @@
-newsworthycharts/__init__.py,sha256=lUar7rzqonwWFT9D99y-rjteKifHZ4_3CizWrEFoSk8,1160
+newsworthycharts/__init__.py,sha256=YejHDUN0WmsE1o9IIiZZFyVDgdMbw2LUW36azjvNuzM,1160
 newsworthycharts/bubblemap.py,sha256=_AMj3RkmKDKVmrtj3FuuY776xRUSEf2qE8tG0vQ3Lyg,2619
 newsworthycharts/categoricalchart.py,sha256=k2cd96pNysbVU88nZduiLGpzyjMsDXTbASAVu6ov-kI,14686
 newsworthycharts/chart.py,sha256=FX8aMTAZCUYtDpY4UNvKAly7NevZSFAVraK4JNdxp5Q,30557
 newsworthycharts/choroplethmap.py,sha256=KXtdiRBe-_j_zUozUgdhAWyoYN-eUdFxt9mneN10H1w,6670
-newsworthycharts/datalist.py,sha256=pQTzWg1lKslAstiF04oK7FwvoxTK2-1jOvrlOy7bGpk,3721
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
-newsworthycharts/formatter.py,sha256=N-Z2lDQKcI7Nv9JluAg6yWK8HwPLq09PhbBrSAabGxQ,2728
-newsworthycharts/locator.py,sha256=WIe4_jQKrvdpXEayK8zGGgPVyHHoFeO6KBqDTr7qE14,1944
 newsworthycharts/map.py,sha256=e0WRcLTmb1KPZ7_-05QXgthMEmKrTpnci40DXnmd6Rc,5984
-newsworthycharts/mimetypes.py,sha256=t_wD5FD2o1Di7NWAQGwc8ScPry48S1_7hX03_1Do-G8,129
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
 newsworthycharts/scatterplot.py,sha256=6iaMoiZx__Gc-2Hcdw-8Ga5dSonrFo3oexKNmSFuir4,4959
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
 newsworthycharts/serialchart.py,sha256=mEE-9Yahas7o86wTaynJY4hyhBm1If5qPYB8gExMXlo,24563
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
-newsworthycharts/utils.py,sha256=aC3OF-HAsEe_WnNV2Ah_oq0QYcAETUscRZ6nQBpazQg,2842
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 newsworthycharts/custom/climate_cars.py,sha256=WyNLgjgRCv_zRrzVuk_BmcigFSzpzudjEAYmdvdBe8I,9407
 newsworthycharts/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,7 +19,7 @@ newsworthycharts/lib/colors.py,sha256=U04TDkvoMQkcldRFXfnwyLOTwq1SWW2se-Ad-DNcw9
 newsworthycharts/lib/datalist.py,sha256=fsO_esZBt4Aw_4n_l2LuswAYArbM-8Z8G9DAXo1oVZU,5376
 newsworthycharts/lib/formatter.py,sha256=GNH43hE0bC17OgiV8LYH3YUrEhm7OJh9XzfSV4HVtHo,4838
 newsworthycharts/lib/geography.py,sha256=K0_teFmuPJwXX7Py-amJB_1YY5_gL2kBYhz1LrRCyTg,584
-newsworthycharts/lib/locator.py,sha256=Jdi6P6Z-3DSoG_lhYQKh97_asWt9JqBV3vBzHnf1k0I,2825
+newsworthycharts/lib/locator.py,sha256=73ZqAvvLBhnWd0rKEHTyPiIL1H3MFHiUlb8aRKEm4FA,2938
 newsworthycharts/lib/mimetypes.py,sha256=bL9HtVWbn2Of39LcBt4u4yelkr4bGZiyebq3OfLnfFY,237
 newsworthycharts/lib/utils.py,sha256=2Ko0dNFw2eHd32zQwJFUsgDkJGWSl6VacZs4AFPgrc8,7038
 newsworthycharts/maps/se-4.gpkg,sha256=oWw5j7FPVpI0ig67jNDim8qSn5SG8rcHp0014-uTKZM,290816
@@ -33,8 +28,8 @@ newsworthycharts/rc/newsworthy,sha256=X0btLNrmk2DRrfOsKj_WCSIgeD6btacEN2tRF_B4m8
 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.54.4.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.54.4.dist-info/METADATA,sha256=iqOoG5714-3F9uiMWbM8pePOJHo089roKIdHkRCD8f0,23648
-newsworthycharts-1.54.4.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-newsworthycharts-1.54.4.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.54.4.dist-info/RECORD,,
+newsworthycharts-1.54.5.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.54.5.dist-info/METADATA,sha256=yMQ9TNCdd4z4ovk5O7kw6_HCLd4aNJtfdi2pvaQswto,23776
+newsworthycharts-1.54.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+newsworthycharts-1.54.5.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.54.5.dist-info/RECORD,,

{newsworthycharts-1.54.4.dist-info → newsworthycharts-1.54.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

newsworthycharts/datalist.py

@@ -1,128 +0,0 @@
-"""
-Holds a class for storing lists of data (timeseries etc), and related methods.
-"""
-from collections.abc import MutableSequence
-from math import inf
-from .utils import to_float, to_date
-from numpy import array, isnan, interp, flatnonzero
-
-
-def fill_na(arr):
-    """Get an estimate for missing value based on closest non-missing values in
-    series.
-    https://stackoverflow.com/questions/9537543/replace-nans-in-numpy-array-with-closest-non-nan-value
-
-    >>> fill_na([2.0, None, 4.0])
-    [2.0, 3.0, 4.0]
-    """
-    if isinstance(arr, list):
-        arr = array(arr)
-    arr = arr.astype(float)
-    mask = isnan(arr)
-    arr[mask] = interp(flatnonzero(mask),
-                       flatnonzero(~mask),
-                       arr[~mask])
-
-    return arr.tolist()
-
-
-class DataList(MutableSequence):
-    """ A list of datasets, that keeps track of some useful additional data
-    such as min/max values.
-    Datasets are on the format [(x1, y1), (x2, y2), ...]
-    """
-
-    def __init__(self, *args):
-        self.min_val = inf
-        self.max_val = -inf
-        self._x_points = set()
-        self.list = list()
-        self.extend(list(args))
-
-    def check(self, v):
-        # Update metadata with newly added data
-        values = [to_float(x[1]) for x in v]
-        values = [x for x in values if x is not None]
-        if len(values):
-            self.min_val = min(self.min_val, min(values))
-            self.max_val = max(self.max_val, max(values))
-        self._x_points.update([x[0] for x in v])
-
-        # Normalize to 3 digit syntax
-        v = [x if len(x) > 2
-             else (x[0], x[1], None)
-             for x in v]
-        # Automatically enumerate empty x values / category names if empty
-        v = [x if x[0] not in ["", None]
-             else (i, x[1], x[2])
-             for i, x in enumerate(v)]
-        return v
-
-    @property
-    def values(self):
-        """ Return values from each data serie """
-        return [[to_float(x[1]) for x in s] for s in self.list]
-
-    @property
-    def as_dict(self):
-        """ Return data points as dictionaries """
-        return [{x[0]: x[1] for x in s} for s in self.list]
-
-    @property
-    def filled_values(self):
-        """ Return values with all gaps filled, so that each series has the
-        same number of points.
-
-        >>>> dl = DataList([
-                    [("a", 5), ("b", 6), ("c", 7)],
-                    [("a", 1), ("c", 3)]
-             ])
-        >>>> dl.filled_y_values
-        [[5, 6, 7], [1, 2, 3]]
-        """
-
-        x_points = self.x_points
-        return [fill_na([to_float(d[x])
-                        if x in d else None
-                        for x in x_points])
-                for d in self.as_dict]
-
-    @property
-    def x_points(self):
-        return sorted(list(self._x_points))
-    
-    @property
-    def inner_min_x(self):
-        return max(list(filter(lambda x: x[1] is not None, s))[0][0] for s in self.list)
-
-    @property
-    def inner_max_x(self):
-        return min(list(filter(lambda x: x[1] is not None, s))[-1][0] for s in self.list)
-
-    @property
-    def outer_min_x(self):
-        return min(list(filter(lambda x: x[1] is not None, s))[0][0] for s in self.list)
-
-    @property
-    def outer_max_x(self):
-        return max(list(filter(lambda x: x[1] is not None, s))[-1][0] for s in self.list)
-
-    def __len__(self):
-        return len(self.list)
-
-    def __getitem__(self, i):
-        return self.list[i]
-
-    def __delitem__(self, i):
-        del self.list[i]
-
-    def __setitem__(self, i, v):
-        v = self.check(v)
-        self.list[i] = v
-
-    def insert(self, i, v):
-        v = self.check(v)
-        self.list.insert(i, v)
-
-    def __str__(self):
-        return str(self.list)

newsworthycharts/formatter.py

@@ -1,93 +0,0 @@
-"""
- Module for doing (very) simple i18n work.
-"""
-from babel.numbers import format_decimal, format_percent, Locale
-from babel.units import format_unit
-from decimal import Decimal
-
-
-class Formatter(object):
-    """
-     A formatter for a specific language and locale.
-     Contains some methods for number and text formatting.
-
-     Heavier i18n work should be before involving newsworthycharts.
-     Usage:
-
-      >>> fmt = Formatter("sv-SE")
-      >>> fmt.percent(0.14)
-      "14 %"
-    """
-    def __init__(self, lang, decimals=None, scale="celcius"):
-        """
-        :param decimals (int): force formatting to N number of decimals
-        """
-        self.l = Locale.parse(lang.replace("-", "_"))
-        self.language = self.l.language
-        self.decimals = decimals
-        self.scale = scale
-
-    def __repr__(self):
-        return "Formatter: " + repr(self.l)
-
-    def __str__(self):
-        return self.l.get_display_name()
-
-    def percent(self, x, *args, **kwargs):
-
-        if self.decimals is None:
-            # Show one decimal by default if values is < 1%
-            if abs(x) < 0.01:
-                x = round(x, 1+2)
-            else:
-                x = round(x, 2)
-        else:
-            x = round(x, self.decimals+2)
-
-        return format_percent(x, locale=self.l, decimal_quantization=False)
-
-    def temperature_short(self, x, *args, **kwargs):
-        """ Format a temperature in deegrees, without scale letter """
-
-        decimals = self.decimals
-        if decimals is None:
-            decimals = 1
-
-        x = round(Decimal(x), decimals)
-        str = format_unit(x, 'temperature-generic', "short", locale=self.l)
-        return str
-
-    def temperature(self, x, *args, **kwargs):
-        """ Format a temperature in deegrees, with scale letter """
-
-        decimals = self.decimals
-        if decimals is None:
-            decimals = 1
-
-        scale = "temperature-{}".format(self.scale)
-        x = round(Decimal(x), decimals)
-        str = format_unit(x, scale, "short", locale=self.l)
-        return str
-
-    def number(self, x, *args, **kwargs):
-        """Format as number.
-
-        :param decimals (int): number of decimals.
-        """
-        decimals = self.decimals
-        if decimals is None:
-            # Default roundings
-            if abs(x) < 0.1:
-                decimals = 2
-            elif abs(x) < 1:
-                decimals = 1
-            else:
-                decimals = 0
-        x = round(Decimal(x), decimals)
-        return format_decimal(x, locale=self.l)
-
-    def short_month(self, x, *args, **kwargs):
-        return self.l.months['format']['abbreviated'][x]
-
-    def month(self, x, *args, **kwargs):
-        return self.l.months['format']['wide'][x]

newsworthycharts/locator.py

@@ -1,60 +0,0 @@
-""" Custom locators and related methods
-"""
-from matplotlib.dates import YearLocator, MonthLocator, DayLocator
-from datetime import datetime
-
-
-def get_year_ticks(start_date, end_date, max_ticks=5):
-    """ Get `max_ticks` or less evenly distributed yearly ticks, including
-    start and end years. All ticks fall on January 1.
-    """
-
-    years = range(start_date.year, end_date.year+1)
-    n_years = len(years)
-    max_ticks = min(max_ticks, n_years)
-    # Avoid N2 < ticks < N, where there will be odd looking gaps
-    if n_years > 3:
-        if round(n_years/2) < max_ticks < n_years:
-            max_ticks = round(n_years/2)
-
-    # -2 for the ends
-    # +1 because cutting a cake in n+1 pieces gives n cuts
-    if max_ticks > 1:
-        cuts = n_years/(max_ticks-2+1)
-    else:
-        cuts = 0
-    selected_years = [years[int(x * cuts)] for x in range(0, max_ticks-1)]
-
-    # add last year
-    if max_ticks > 0:
-        selected_years.append(years[-1])
-
-    # Ticks should be on the first day of the year
-    selected_dates = [datetime(y, 1, 1) for y in selected_years]
-    return selected_dates
-
-
-def get_best_locator(delta, points):
-    """ Get the optimal locator given a time delta and number of points.
-    This methods will be much more conservative than Matplotlib's AutoLocator,
-    trying to keep the x axis as clean as possible, while still including
-    enough clues for the reader to easily understand the graph.
-    """
-    if delta.days > 365*150:
-        return YearLocator(100)
-    if delta.days > 365*45:
-        return YearLocator(20)
-    elif delta.days > 365:
-        if points > 20:
-            return YearLocator(10)
-        elif points > 10:
-            return YearLocator(5)
-        elif points > 5:
-            return YearLocator(2)
-        else:
-            return YearLocator()
-    elif delta.days > 30:
-        # FIXME dont print every month
-        return MonthLocator()
-    else:
-        return DayLocator()

newsworthycharts/mimetypes.py

@@ -1,8 +0,0 @@
-""" Mime type data
-"""
-
-MIME_TYPES = {
-    'png': "image/png",
-    'svg': "image/svg+xml",
-    'eps': "application/postscript"
-}

newsworthycharts/utils.py

@@ -1,83 +0,0 @@
-""" Various utility methods """
-from matplotlib import rc_file, rcParams
-from matplotlib.colors import to_rgba
-from datetime import datetime
-import os
-import yaml
-
-HERE = os.path.dirname(__file__)
-
-
-class StyleNotFoundError(FileNotFoundError):
-    pass
-
-
-def loadstyle(style_name):
-    """ Load a custom style file, adding both rcParams and custom params.
-    Writing a proper parser for these settings is in the Matplotlib backlog,
-    so let's keep calm and avoid inventing their wheel.
-    """
-
-    style = {}
-    style_file = os.path.join(HERE, 'rc', style_name)
-    try:
-        # Check rc directory for built in styles first
-        rc_file(style_file)
-    except FileNotFoundError as e:
-        # Check current working dir or path
-        style_file = style_name
-        try:
-            rc_file(style_file)
-        except FileNotFoundError as e:
-            raise StyleNotFoundError("No such style file found")
-    style = rcParams.copy()
-
-    # The style files may also contain an extra section with typography
-    # for titles and captions (these can only be separately styled in code,
-    # as of Matplotlib 2.2)
-    # This is a hack, but it's nice to have all styling in one file
-    # The extra styling is prefixed with `#!`
-    with open(style_file, 'r') as f:
-        doc = f.readlines()
-        rcParamsNewsworthy = "\n".join([d[2:]
-                                       for d in doc if d.startswith("#!")])
-    rcParamsNewsworthy = yaml.safe_load(rcParamsNewsworthy)
-    style["title_font"] = [x.strip()
-                           for x in rcParamsNewsworthy["title_font"]
-                           .split(",")]
-    color = rcParamsNewsworthy.get("neutral_color",
-                                   rcParams["figure.edgecolor"])
-    strong_color = rcParamsNewsworthy.get("strong_color", color)
-    fill_between_color = rcParamsNewsworthy.get("fill_between_color", "F7F4F4")
-    fill_between_alpha = rcParamsNewsworthy.get("fill_between_alpha", 0.5)
-    style["neutral_color"] = to_rgba("#" + str(color), 1)
-    style["strong_color"] = to_rgba("#" + str(strong_color), 1)
-    style["fill_between_color"] = to_rgba("#" + str(fill_between_color), 1)
-    style["fill_between_alpha"] = float(fill_between_alpha)
-    if "logo" in rcParamsNewsworthy:
-        style["logo"] = rcParamsNewsworthy["logo"]
-
-    return style
-
-
-def rpad(list_, item, length):
-    """
-     Right pad a list to a certain length, using `item`
-    """
-    if list_ is None:
-        list_ = []
-    return list_ + [item for i in range(max(0, length-len(list_)))]
-
-
-def to_float(s):
-    """Convert string to float, but also handles None and 'null'."""
-    if s is None:
-        return None
-    if str(s) == "null":
-        return
-    return float(s)
-
-
-def to_date(s):
-    """Convert date string to datetime date."""
-    return datetime.strptime(s, "%Y-%m-%d")