Skip to content

Commit ab427ae

Browse files
committed
Merge branch 'master' into imshow-animation
2 parents 12cec34 + 91e269f commit ab427ae

File tree

184 files changed

+11288
-5495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+11288
-5495
lines changed

.circleci/config.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- checkout
1010
- run:
1111
name: Install black
12-
command: "sudo pip install black"
12+
command: "sudo pip install black==19.10b0"
1313
- run:
1414
name: Check formatting with black
1515
command: "black --check ."
@@ -314,7 +314,7 @@ jobs:
314314
pytest packages/python/plotly/plotly/tests/test_orca
315315
316316
- store_artifacts:
317-
path: plotly/tests/test_orca/images/linux/failed
317+
path: packages/python/plotly/plotly/tests/test_orca/images/linux/failed
318318

319319
plotlyjs_dev_build:
320320
docker:
@@ -374,7 +374,7 @@ jobs:
374374
docker:
375375
# specify the version you desire here
376376
# use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
377-
- image: circleci/python:3.6.8-node
377+
- image: circleci/python:3.7-stretch-node-browsers
378378

379379
working_directory: ~/project
380380

@@ -400,12 +400,13 @@ jobs:
400400
. venv/bin/activate
401401
npm install [email protected]
402402
npm install orca
403+
pip install -U pip
403404
pip uninstall -y plotly
404405
pip install -r requirements.txt
405406
if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
406407
pip uninstall -y plotly
407408
cd ../packages/python/plotly
408-
python3 setup.py install
409+
pip install -e .
409410
cd ../../../doc
410411
fi
411412
echo 'export PATH="/home/circleci/project/doc/node_modules/.bin:$PATH"' >> $BASH_ENV
@@ -463,6 +464,15 @@ jobs:
463464
command: |
464465
cd doc
465466
. venv/bin/activate
467+
# For the API doc, we need to use the local version of plotly
468+
# since we are tweaking the source because of
469+
# graph_objs/graph_objects
470+
if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
471+
pip uninstall -y plotly
472+
cd ../packages/python/plotly
473+
pip install -e .
474+
cd ../../../doc
475+
fi
466476
cd apidoc
467477
make html
468478
if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
@@ -478,12 +488,14 @@ jobs:
478488
rm -rf .git
479489
cd ../..
480490
fi
481-
482491
cd ../..
483492
484493
- store_artifacts:
485494
path: doc/build
486495
destination: doc/build
496+
- store_artifacts:
497+
path: doc/apidoc/_build/
498+
destination: doc/apidoc/_build/
487499

488500
workflows:
489501
version: 2
@@ -507,6 +519,5 @@ workflows:
507519
- python-3.7-optional
508520
- python-3.7-plot_ly
509521
- python-2-7-orca
510-
- python-3-5-orca
511522
- python-3-7-orca
512523
- build-doc

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [4.10.0] - unreleased
66

7+
### Added
8+
9+
- Added `plotly.io.full_figure_for_development()` and `plotly.graph_objects.Figure.full_figure_for_development()` ([#2737](https://github.com/plotly/plotly.py/pull/2737))
710

8-
## [4.9.1] - unreleased
11+
### Updated
912

13+
- `px.imshow` has a new `binary_string` boolean argument, which passes the
14+
image data as a b64 binary string when True. Using binary strings allow for
15+
faster image rendering and smaller figure size. Additional optional arguments
16+
`binary_backend`, `binary_format` and `binary_compression_level` control
17+
how to generate the b64 string ([#2691](https://github.com/plotly/plotly.py/pull/2691)
18+
- `px.imshow` has a new `constrast_rescaling` argument in order to choose how
19+
to set data values corresponding to the bounds of the color range
20+
([#2691](https://github.com/plotly/plotly.py/pull/2691)
1021

1122
## [4.9.0] - 2020-07-16
1223

binder/requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ datashader
1616
pyarrow
1717
cufflinks==0.17.3
1818
kaleido
19+
scikit-learn
20+
umap-learn

compatibility.md

Lines changed: 0 additions & 247 deletions
This file was deleted.

0 commit comments

Comments
 (0)