Merge branch 'master' of github.com:plotly/Kaleido

plotly · Jun 30, 2020 · 77262a1 · 77262a1
2 parents 28a6dee + 9d7e41d
commit 77262a1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -63,7 +63,7 @@ jobs:
   mac_build_blink:
     macos:  # indicate that we are using the macOS executor
       xcode: 11.3.0 # indicate our selected version of Xcode
-    resource_class: medium
+    resource_class: large
     steps:
       - checkout
       - attach_workspace:
@@ -82,7 +82,7 @@ jobs:
   mac_build:
     macos:  # indicate that we are using the macOS executor
       xcode: 11.3.0 # indicate our selected version of Xcode
-    resource_class: medium
+    resource_class: large
     steps:
       - checkout
       - attach_workspace:
@@ -122,6 +122,9 @@ jobs:
       shell: powershell.exe
     steps:
       - checkout
+      - run:
+          name: Update PowerShell.Archive to fix slash direction
+          command: Install-Module Microsoft.PowerShell.Archive -MinimumVersion 1.2.3.0 -Repository PSGallery -Force
       - attach_workspace:
           at: .\repos
       - run: .\repos\win_scripts\build_kaleido.ps1

diff --git a/repos/kaleido/py/kaleido/scopes/base.py b/repos/kaleido/py/kaleido/scopes/base.py
@@ -12,6 +12,7 @@
 
 class BaseScope(object):
     _json_encoder = None
+    _text_formats = ("svg",)
 
     def __init__(self, disable_gpu=True, suppress_stderr=True, **kwargs):
 
@@ -162,7 +163,7 @@ def to_image(self, figure, format="png", width=700, height=500, scale=1):
 
         # Export successful
         img_string = response.pop("result", None)
-        if format == 'svg':
+        if format in self._text_formats:
             img = img_string.encode()
         else:
             img = base64.decodebytes(img_string.encode())

diff --git a/repos/kaleido/py/kaleido/scopes/plotly.py b/repos/kaleido/py/kaleido/scopes/plotly.py
@@ -4,6 +4,7 @@
 
 class PlotlyScope(BaseScope):
     _json_encoder = PlotlyJSONEncoder
+    _text_formats = ("svg", "json")
 
     def __init__(self, plotlyjs=None, mathjax=None, topojson=None, mapbox_access_token=None, **kwargs):
         # TODO: validate args