Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ac61095

Browse filesBrowse files
camdecostercamdecoster
committed
Merge remote-tracking branch 'origin/master' into cam/7334/switch-geodata-providers
2 parents 86f048c + 40f2221 commit ac61095
Copy full SHA for ac61095
Expand file treeCollapse file tree

38 files changed

+617
-605
lines changed

‎.circleci/download_google_fonts.py

Copy file name to clipboardExpand all lines: .circleci/download_google_fonts.py
+9-2Lines 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

Copy file name to clipboardExpand all lines: devtools/test_dashboard/index-mathjax3.html
+1-1Lines 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

Copy file name to clipboardExpand all lines: devtools/test_dashboard/index-mathjax3chtml.html
+1-1Lines 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

Copy file name to clipboardExpand all lines: devtools/test_dashboard/index-strict.html
+1-1Lines 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

Copy file name to clipboardExpand all lines: devtools/test_dashboard/index.html
+1-1Lines 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

Copy file name to clipboardExpand all lines: dist/plot-schema.json
+287-281Lines changed: 287 additions & 281 deletions
Large diffs are not rendered by default.

‎package-lock.json

Copy file name to clipboardExpand all lines: package-lock.json
+22-17Lines 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

Copy file name to clipboardExpand all lines: package.json
+3-3Lines 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

Copy file name to clipboardExpand all lines: src/lib/prepare_regl.js
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/plots/font_attributes.js
+3-9Lines 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: {

‎tasks/noci_test.sh

Copy file name to clipboardExpand all lines: tasks/noci_test.sh
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test_image () {
2828
$root/../orca/bin/orca.js graph \
2929
$root/test/image/mocks/mapbox_osm-style.json \
3030
$root/test/image/mocks/mapbox_density0-legend.json \
31-
--mathjax $root/node_modules/mathjax-v2/MathJax.js \
31+
--mathjax $root/node_modules/@plotly/mathjax-v2/MathJax.js \
3232
--plotly $root/build/plotly.js \
3333
--mapbox-access-token "pk.eyJ1IjoicGxvdGx5LWRvY3MiLCJhIjoiY2xpMGYyNWgxMGJhdzNzbXhtNGI0Nnk0aSJ9.0oBvi_UUZ0O1N0xk0yfRwg" \
3434
--output-dir $root/test/image/baselines/ \

‎test/image/baselines/map_0.png

Copy file name to clipboard
-5.42 KB
Loading

‎test/image/baselines/map_angles.png

Copy file name to clipboard
1.52 KB
Loading

‎test/image/baselines/map_bubbles-text.png

Copy file name to clipboard
0 Bytes
Loading

‎test/image/baselines/map_bubbles.png

Copy file name to clipboard
-4.99 KB
Loading

‎test/image/baselines/map_carto-style.png

Copy file name to clipboard
-4.32 KB
Loading

‎test/image/baselines/map_carto-text.png

Copy file name to clipboard
-4.81 KB
Loading

‎test/image/baselines/map_choropleth-multiple.png

Copy file name to clipboard
-8.17 KB
Loading

‎test/image/baselines/map_choropleth-raw-geojson.png

Copy file name to clipboard
-366 Bytes
Loading

‎test/image/baselines/map_connectgaps.png

Copy file name to clipboard
-3.08 KB
Loading

‎test/image/baselines/map_density-multiple.png

Copy file name to clipboard
-3.91 KB
Loading

‎test/image/baselines/map_density-multiple_legend.png

Copy file name to clipboard
-2.51 KB
Loading

‎test/image/baselines/map_density0.png

Copy file name to clipboard
-5.27 KB
Loading

‎test/image/baselines/map_fill.png

Copy file name to clipboard
5 Bytes
Loading

‎test/image/baselines/map_fonts-supported-metropolis-italic.png

Copy file name to clipboard
-3 Bytes
Loading

‎test/image/baselines/map_fonts-supported-metropolis-weight.png

Copy file name to clipboard
-16 Bytes
Loading

‎test/image/baselines/map_fonts-supported-metropolis.png

Copy file name to clipboard
-16 Bytes
Loading

‎test/image/baselines/map_fonts-supported-open-sans-weight.png

Copy file name to clipboard
-7 Bytes
Loading

‎test/image/baselines/map_fonts-supported-open-sans.png

Copy file name to clipboard
-7 Bytes
Loading

‎test/image/baselines/map_geojson-attributes.png

Copy file name to clipboard
-2.73 KB
Loading

‎test/image/baselines/map_layers.png

Copy file name to clipboard
265 Bytes
Loading

‎test/image/baselines/map_scattercluster.png

Copy file name to clipboard
13 Bytes
Loading

‎test/image/baselines/map_symbol-text.png

Copy file name to clipboard
-10.8 KB
Loading

‎test/image/baselines/map_texttemplate.png

Copy file name to clipboard
-6.28 KB
Loading

‎test/jasmine/bundle_tests/mathjax_config_test.js

Copy file name to clipboardExpand all lines: test/jasmine/bundle_tests/mathjax_config_test.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ describe('Test MathJax v' + mathjaxVersion + ' config test:', function() {
2828
}
2929

3030
var src = mathjaxVersion === 3 ?
31-
'/base/node_modules/mathjax-v3/es5/tex-svg.js' :
32-
'/base/node_modules/mathjax-v2/MathJax.js?config=TeX-AMS_SVG';
31+
'/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' :
32+
'/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS_SVG';
3333

3434
loadScript(src, done);
3535
});

‎test/jasmine/bundle_tests/mathjax_test.js

Copy file name to clipboardExpand all lines: test/jasmine/bundle_tests/mathjax_test.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ var mathjaxVersion = __karma__.config.mathjaxVersion;
1111
describe('Test MathJax v' + mathjaxVersion + ':', function() {
1212
beforeAll(function(done) {
1313
var src = mathjaxVersion === 3 ?
14-
'/base/node_modules/mathjax-v3/es5/tex-svg.js' :
15-
'/base/node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG';
14+
'/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' :
15+
'/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG';
1616

1717
// N.B. we have to load MathJax "dynamically" as Karma
1818
// does not undefined the MathJax's `?config=` parameter.

‎test/jasmine/karma.conf.js

Copy file name to clipboardExpand all lines: test/jasmine/karma.conf.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ if(isFullSuite) {
119119

120120
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
121121
var pathToTopojsonDist = path.join(__dirname, '..', '..', 'dist', 'topojson');
122-
var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', 'mathjax-v2');
123-
var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', 'mathjax-v3');
122+
var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v2');
123+
var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v3');
124124
var pathToVirtualWebgl = path.join(__dirname, '..', '..', 'node_modules', 'virtual-webgl', 'src', 'virtual-webgl.js');
125125

126126
var reporters = [];

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.