Skip to content

Commit 94a01ea

Browse files
authored
Merge pull request #2307 from plotly/bump-orca-1.3.0
bump Orca to 1.3.1
2 parents 93cdc5e + 313ee4d commit 94a01ea

File tree

7 files changed

+14274
-5222
lines changed

7 files changed

+14274
-5222
lines changed

Diff for: .circleci/create_conda_optional_env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
1919
requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets
2020

2121
# Install orca into environment
22-
$HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca=1.2.1
22+
$HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca==1.3.1
2323
fi

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ installation of the plotly [orca](https://github.com/plotly/orca) command line u
161161
These dependencies can both be installed using conda:
162162

163163
```
164-
conda install -c plotly plotly-orca==1.2.1 psutil
164+
conda install -c plotly plotly-orca==1.3.1 psutil
165165
```
166166

167167
Or, `psutil` can be installed using pip...

Diff for: packages/python/plotly/plotly/io/_orca.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1429,7 +1429,10 @@ def ensure_server():
14291429
# specified port.
14301430
DEVNULL = open(os.devnull, "wb")
14311431
with orca_env():
1432-
orca_state["proc"] = subprocess.Popen(cmd_list, stdout=DEVNULL)
1432+
stderr = DEVNULL if "CI" in os.environ else None # fix for CI
1433+
orca_state["proc"] = subprocess.Popen(
1434+
cmd_list, stdout=DEVNULL, stderr=stderr
1435+
)
14331436

14341437
# Update orca.status so the user has an accurate view
14351438
# of the state of the orca server

Diff for: packages/python/plotly/plotly/tests/test_orca/images/linux/failed/fig1.eps

+1,241-1,482
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: packages/python/plotly/plotly/tests/test_orca/images/linux/fig1.eps

+1,199-1,206
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: packages/python/plotly/plotly/tests/test_orca/images/linux/latexfig.eps

+3,874-822
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: packages/python/plotly/plotly/tests/test_orca/images/linux/topofig.eps

+7,954-1,709
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)