This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit dc9c8df

committed

Apr 23, 2021

Merge remote-tracking branch 'origin' into fcollonval/issue3036

# Conflicts: # .circleci/config.yml # doc/python/troubleshooting.md # packages/javascript/plotlywidget/package-lock.json # packages/javascript/plotlywidget/src/Figure.ts # packages/python/chart-studio/tox.ini # packages/python/plotly/setup.py # packages/python/plotly/tox.ini

2 parents 191a548 + b343fcc commit dc9c8dfCopy full SHA for dc9c8df

139 files changed

+4432

-15665

lines changed

.circleci
CHANGELOG.md
build_for_conda.md
doc
packages
- javascript/plotlywidget/src
  - Figure.ts
- python
  - chart-studio
    - specs
      - gridspec.md
    - test_requirements
      - requirements_37.txt
    - tox.ini
  - plotly
    - _plotly_utils
      - colors
        __init__.py
      - optional_imports.py
    - plotly
      - figure_factory
        README.md
        _gantt.py
        _violin.py
      - io
        _kaleido.py
        _orca.py
      - tests
        test_core
        test_figure_messages
        test_add_traces.py
        test_graph_objs
        test_graph_objs.py
        test_utils
        test_utils.py
        test_optional
        optional_utils.py
        test_autoshapes
        __init__.py
        common.py
        test_annotated_shapes.py
        test_annotated_shapes_annotations.json
        test_axis_span_shapes.py
        test_offline
        test_offline.py
        test_px
        __init__.py
        test_colors.py
        test_facets.py
        test_imshow.py
        test_marginals.py
        test_pandas_backend.py
        test_px.py
        test_px_functions.py
        test_px_hover.py
        test_px_input.py
        test_px_wide.py
        test_trendline.py
        test_subplots
        test_make_subplots.py
        test_tools
        test_figure_factory.py
        test_utils
        test_utils.py
        test_orca
        images/linux
        failed
        fig1.eps
        fig1.eps
        latexfig.eps
        topofig.eps
        test_to_image.py
    - recipe
      - meta.yaml
    - requirements.txt
    - setup.py
    - test_requirements
    - tox.ini
release.md

139 files changed

+4432

-15665

lines changed

`‎.circleci/config.yml`

Large diffs are not rendered by default.

`‎.circleci/create_conda_optional_env.sh`

This file was deleted.

Comments

(0)

Please sign in to comment.