newsworthycharts 1.73.3__py3-none-any.whl → 1.74.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- newsworthycharts/__init__.py +1 -1
- newsworthycharts/chart.py +11 -10
- newsworthycharts/choroplethmap.py +1 -0
- newsworthycharts/seasonalchart.py +1 -1
- {newsworthycharts-1.73.3.dist-info → newsworthycharts-1.74.1.dist-info}/METADATA +20 -9
- {newsworthycharts-1.73.3.dist-info → newsworthycharts-1.74.1.dist-info}/RECORD +9 -9
- {newsworthycharts-1.73.3.dist-info → newsworthycharts-1.74.1.dist-info}/WHEEL +0 -0
- {newsworthycharts-1.73.3.dist-info → newsworthycharts-1.74.1.dist-info}/licenses/LICENSE.txt +0 -0
- {newsworthycharts-1.73.3.dist-info → newsworthycharts-1.74.1.dist-info}/top_level.txt +0 -0
newsworthycharts/__init__.py
CHANGED
newsworthycharts/chart.py
CHANGED
@@ -2,6 +2,7 @@
|
|
2
2
|
For use with Newsworthy's robot writer and other similar projects.
|
3
3
|
"""
|
4
4
|
import types
|
5
|
+
import math
|
5
6
|
from .lib import color_fn
|
6
7
|
from .lib.mimetypes import MIME_TYPES
|
7
8
|
from .lib.utils import loadstyle, outline, to_date
|
@@ -107,15 +108,6 @@ class Chart(object):
|
|
107
108
|
if height:
|
108
109
|
self._h = int(height)
|
109
110
|
|
110
|
-
# Dynamic typography
|
111
|
-
self._title_font = FontProperties()
|
112
|
-
# scale up slightly < 600px, scale down slightly > 600px
|
113
|
-
import math
|
114
|
-
adjusted_fontsize = math.log(self._h, 600)
|
115
|
-
self._title_font.set_family(self._nwc_style["title_font"])
|
116
|
-
self._title_font.set_size(int(adjusted_fontsize * self._style["figure.titlesize"]))
|
117
|
-
self._title_font.set_weight(self._style["figure.titleweight"])
|
118
|
-
|
119
111
|
# Chart elements. Made available for fitting.
|
120
112
|
self._title_elem = None
|
121
113
|
self._subtitle_elem = None
|
@@ -496,6 +488,14 @@ class Chart(object):
|
|
496
488
|
self._h = h # This was tentatively set in init. Overwritten here!
|
497
489
|
self._set_size(self._w, h)
|
498
490
|
|
491
|
+
# Dynamic typography
|
492
|
+
self._title_font = FontProperties()
|
493
|
+
# scale up slightly < 600px, scale down slightly > 600px
|
494
|
+
adjusted_fontsize = math.log(self._h, 600)
|
495
|
+
self._title_font.set_family(self._nwc_style["title_font"])
|
496
|
+
self._title_font.set_size(int(adjusted_fontsize * self._style["figure.titlesize"]))
|
497
|
+
self._title_font.set_weight(self._style["figure.titleweight"])
|
498
|
+
|
499
499
|
# Legend / data labels
|
500
500
|
if self.legend_title:
|
501
501
|
# Legend can contain data labels (.labels[]),
|
@@ -659,7 +659,8 @@ class Chart(object):
|
|
659
659
|
header_height += self._title_rel_height
|
660
660
|
if self._subtitle_elem:
|
661
661
|
header_height += self._subtitle_rel_height
|
662
|
-
self.
|
662
|
+
if self._title_elem or self._subtitle_elem:
|
663
|
+
self._fig.subplots_adjust(top=1 - header_height)
|
663
664
|
|
664
665
|
# Fit area below chart
|
665
666
|
try:
|
@@ -23,7 +23,7 @@ class SeasonalChart(SerialChart):
|
|
23
23
|
interval = self.interval or self._guess_interval()
|
24
24
|
# Use either highlight or last point of the series that extends furthest to the right
|
25
25
|
seasonal_point = self.highlight or self.data.outer_max_x
|
26
|
-
if interval
|
26
|
+
if interval in ["monthly", "quarterly"]:
|
27
27
|
date_suffix = seasonal_point[-5:]
|
28
28
|
else:
|
29
29
|
raise NotImplementedError("Seasonal chart currently only supports monthly data")
|
@@ -1,9 +1,9 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: newsworthycharts
|
3
|
-
Version: 1.
|
3
|
+
Version: 1.74.1
|
4
4
|
Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
|
5
5
|
Home-page: https://github.com/jplusplus/newsworthycharts
|
6
|
-
Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.
|
6
|
+
Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.74.1.tar.gz
|
7
7
|
Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
|
8
8
|
Author-email: stockholm@jplusplus.org
|
9
9
|
License: MIT
|
@@ -186,11 +186,11 @@ These settings are available for all chart types:
|
|
186
186
|
|
187
187
|
**SeasonalChart**
|
188
188
|
|
189
|
-
|
189
|
+
*Inherits from SerialChart*
|
190
190
|
|
191
191
|
**BumpChart**
|
192
192
|
|
193
|
-
|
193
|
+
*Inherits from SerialChart*
|
194
194
|
|
195
195
|
- label_placement = "right" # [left|right|both|outside|legend]
|
196
196
|
- highlight = None # The label value to of a line to highlight
|
@@ -213,6 +213,8 @@ _ Inherits from SerialChart _
|
|
213
213
|
|
214
214
|
**CategoricalChartWithReference**
|
215
215
|
|
216
|
+
*Inherits from CategoricalChart*
|
217
|
+
|
216
218
|
**Map**
|
217
219
|
|
218
220
|
- `use_bins` = True # If False, the map will be colored by a continuous value
|
@@ -229,18 +231,17 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
|
|
229
231
|
|
230
232
|
**ChoroplethMap**
|
231
233
|
|
232
|
-
|
234
|
+
*Inherits from Map*
|
233
235
|
|
234
|
-
|
236
|
+
- `label_order` = None # A list of categorical values, to control the order of the labels in the legend
|
235
237
|
|
236
238
|
**BubbleMap**
|
237
239
|
|
238
|
-
|
240
|
+
*Inherits from Map*
|
239
241
|
|
240
242
|
**ProgressChart**
|
241
243
|
|
242
|
-
|
243
|
-
|
244
|
+
*Inherits from CategoricalChart*
|
244
245
|
- `target` = None # A target value to compare to, often 1 (when using percentages)
|
245
246
|
|
246
247
|
**RangePlot**
|
@@ -284,6 +285,16 @@ Roadmap
|
|
284
285
|
Changelog
|
285
286
|
---------
|
286
287
|
|
288
|
+
- 1.74.1
|
289
|
+
|
290
|
+
- Wait for data to be added before calculating dynamic heights and responsive typography
|
291
|
+
- Expose dataset from Map class
|
292
|
+
|
293
|
+
- 1.74.0
|
294
|
+
|
295
|
+
- Support quarterly data in SeasonalChart
|
296
|
+
- Dont adjust subplots headers if there is no title or subtitle
|
297
|
+
|
287
298
|
- 1.73.3
|
288
299
|
|
289
300
|
- Remove space around endash in legend title for unitless choropleth maps
|
@@ -1,14 +1,14 @@
|
|
1
|
-
newsworthycharts/__init__.py,sha256=
|
1
|
+
newsworthycharts/__init__.py,sha256=fRJO8g3nfstntB5oDDv7d411O48Z4OkA-eL5IvwTRaY,1221
|
2
2
|
newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
|
3
3
|
newsworthycharts/categoricalchart.py,sha256=Vr-0yFms0hEVCeUa3vLt3FYBqpX4xLQ8YGPc4LGQN_A,18368
|
4
|
-
newsworthycharts/chart.py,sha256=
|
5
|
-
newsworthycharts/choroplethmap.py,sha256=
|
4
|
+
newsworthycharts/chart.py,sha256=QDvIo_HV9fDmadBKLsPJMXrIYL6ZbHnDbVjZuzX9Srw,35441
|
5
|
+
newsworthycharts/choroplethmap.py,sha256=eJiFcUpPFnkiF8VPiHTROdMuuRXHNX8_65rdowBskpc,9709
|
6
6
|
newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
|
7
7
|
newsworthycharts/map.py,sha256=EGh96tU10y7Kgu1e83_VWQSeABdjP6V-0VM6VTHDxu4,6089
|
8
8
|
newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
|
9
9
|
newsworthycharts/rankchart.py,sha256=vMzNMVOv1jae6wuHC_riAdb1lm9oPltO3TT3YQpc0Oc,9376
|
10
10
|
newsworthycharts/scatterplot.py,sha256=weHubdMsDGaBTXejg2TqBNPTQ1K-QBpZqJiyQ8EOEc4,5084
|
11
|
-
newsworthycharts/seasonalchart.py,sha256=
|
11
|
+
newsworthycharts/seasonalchart.py,sha256=ttT8JpvWB3DL0EcTBQor_Uxlow_6tdcl7ibEmLCpUrQ,1982
|
12
12
|
newsworthycharts/serialchart.py,sha256=Km1qxTumFq0GcKPzdaaU5mhq9f2BtusQ0tbpW6WsMiw,31936
|
13
13
|
newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
|
14
14
|
newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
|
@@ -29,8 +29,8 @@ newsworthycharts/rc/newsworthy,sha256=yOIZvYS6PG1u19VMcdtfj9vbihKQsey5IprwqK59Kg
|
|
29
29
|
newsworthycharts/translations/datawrapper_regions.csv,sha256=fzZcQRX6RFMlNNP8mpgfYNdR3Y0QAlQxDXk8FXTaWWI,9214
|
30
30
|
newsworthycharts/translations/regions.py,sha256=Nv1McQjggD4S3JRu82rDMTG3pqUVR13E5-FBpSYbm98,239
|
31
31
|
newsworthycharts/translations/se_municipalities.csv,sha256=br_mm-IvzQtj_W55_ATREhJ97jWnCweBFlDAVY2EBxA,7098
|
32
|
-
newsworthycharts-1.
|
33
|
-
newsworthycharts-1.
|
34
|
-
newsworthycharts-1.
|
35
|
-
newsworthycharts-1.
|
36
|
-
newsworthycharts-1.
|
32
|
+
newsworthycharts-1.74.1.dist-info/licenses/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
|
33
|
+
newsworthycharts-1.74.1.dist-info/METADATA,sha256=4VzONRQwYL2m336k48UXCPBNt29KTv-1rtVhMwWA6P8,35284
|
34
|
+
newsworthycharts-1.74.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
|
35
|
+
newsworthycharts-1.74.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
|
36
|
+
newsworthycharts-1.74.1.dist-info/RECORD,,
|
File without changes
|
{newsworthycharts-1.73.3.dist-info → newsworthycharts-1.74.1.dist-info}/licenses/LICENSE.txt
RENAMED
File without changes
|
File without changes
|