Skip to content

Commit ac61095

Browse files
camdecostercamdecoster
committed
Merge remote-tracking branch 'origin/master' into cam/7334/switch-geodata-providers
2 parents 86f048c + 40f2221 commit ac61095

38 files changed

+617
-605
lines changed

‎.circleci/download_google_fonts.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@
22

33
dirOut = '.circleci/fonts/truetype/googleFonts/'
44

5-
def download(repo, family, types) :
5+
def download(repo, family, types):
66
for t in types :
77
name = family + t + '.ttf'
88
url = repo + name + '?raw=true'
99
print(url)
1010
req = requests.get(url, allow_redirects=True)
11+
if req.status_code != 200:
12+
raise RuntimeError(f"""
13+
Download failed.
14+
Status code: {req.status_code}
15+
Message: {req.reason}
16+
"""
17+
)
1118
open(dirOut + name, 'wb').write(req.content)
1219

1320
download(
@@ -82,7 +89,7 @@ def download(repo, family, types) :
8289
)
8390

8491
download(
85-
'https://github.com/expo/google-fonts/blob/master/font-packages/gravitas-one/',
92+
'https://github.com/expo/google-fonts/blob/main/font-packages/gravitas-one/400Regular/',
8693
'GravitasOne',
8794
[
8895
'_400Regular'

‎devtools/test_dashboard/index-mathjax3.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h4>no MathJax: Apple: $2, Orange: $3</h4>
3737
}
3838
};
3939
</script>
40-
<script src="../../node_modules/mathjax-v3/es5/tex-svg.js"></script>
40+
<script src="../../node_modules/@plotly/mathjax-v3/es5/tex-svg.js"></script>
4141
<script charset="utf-8" id="source" src="../../build/plotly.js" type="module"></script>
4242
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
4343
</body>

‎devtools/test_dashboard/index-mathjax3chtml.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
}
6161
};
6262
</script>
63-
<script src="../../node_modules/mathjax-v3/es5/tex-chtml.js"></script>
63+
<script src="../../node_modules/@plotly/mathjax-v3/es5/tex-chtml.js"></script>
6464

6565
<script charset="utf-8" id="source" src="../../build/plotly.js" type="module"></script>
6666
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>

‎devtools/test_dashboard/index-strict.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</div>
2323
<div id="snapshot"></div>
2424

25-
<script src="../../node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
25+
<script src="../../node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2626
<script charset="utf-8" id="source" src="../../build/plotly.js"></script>
2727
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
2828
</body>

‎devtools/test_dashboard/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222
<div id="snapshot"></div>
2323

24-
<script src="../../node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
24+
<script src="../../node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2525
<script charset="utf-8" id="source" src="../../build/plotly.js"></script>
2626
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
2727
</body>

‎dist/plot-schema.json‎

Lines changed: 287 additions & 281 deletions
Large diffs are not rendered by default.

‎package-lock.json‎

Lines changed: 22 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"point-in-polygon": "^1.1.0",
110110
"polybooljs": "^1.2.2",
111111
"probe-image-size": "^7.2.3",
112-
"regl": "npm:@plotly/regl@^2.1.2",
112+
"@plotly/regl": "^2.1.2",
113113
"regl-error2d": "^2.0.12",
114114
"regl-line2d": "^3.1.3",
115115
"regl-scatter2d": "^3.3.1",
@@ -166,8 +166,8 @@
166166
"lodash": "^4.17.21",
167167
"madge": "^8.0.0",
168168
"mapshaper": "^0.6.102",
169-
"mathjax-v2": "npm:mathjax@2.7.5",
170-
"mathjax-v3": "npm:mathjax@^3.2.2",
169+
"@plotly/mathjax-v2": "npm:mathjax@2.7.5",
170+
"@plotly/mathjax-v3": "npm:mathjax@^3.2.2",
171171
"minify-stream": "^2.1.0",
172172
"npm-link-check": "^5.0.1",
173173
"open": "^8.4.2",

‎src/lib/prepare_regl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var showNoWebGlMsg = require('./show_no_webgl_msg');
66
// files corresponding to regl trace modules
77
// so that bundles with non-regl only don't include
88
// regl and all its bytes.
9-
var createRegl = require('regl');
9+
var createRegl = require('@plotly/regl');
1010

1111
/**
1212
* Idempotent version of createRegl. Create regl instances

‎src/plots/font_attributes.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,9 @@ module.exports = function(opts) {
4949
editType: editType,
5050
description: [
5151
'HTML font family - the typeface that will be applied by the web browser.',
52-
'The web browser will only be able to apply a font if it is available on the system',
53-
'which it operates. Provide multiple font families, separated by commas, to indicate',
54-
'the preference in which to apply fonts if they aren\'t available on the system.',
55-
'The Chart Studio Cloud (at https://chart-studio.plotly.com or on-premise) generates images on a server,',
56-
'where only a select number of',
57-
'fonts are installed and supported.',
58-
'These include *Arial*, *Balto*, *Courier New*, *Droid Sans*, *Droid Serif*,',
59-
'*Droid Sans Mono*, *Gravitas One*, *Old Standard TT*, *Open Sans*, *Overpass*,',
60-
'*PT Sans Narrow*, *Raleway*, *Times New Roman*.'
52+
'The web browser can only apply a font if it is available on the system where',
53+
'it runs. Provide multiple font families, separated by commas, to indicate',
54+
'the order in which to apply fonts if they aren\'t available.',
6155
].join(' ')
6256
},
6357
size: {

0 commit comments

Comments
 (0)