Merge pull request #5 from plotly/master

Sync Fork from Upstream Repo

Author: sthagen

.circleci/config.yml

@@ -9,10 +9,10 @@ jobs:
       - checkout
       - run:
           name: Install black
-          command: 'sudo pip install black'
+          command: "sudo pip install black"
       - run:
           name: Check formatting with black
-          command: 'black --check .'
+          command: "black --check ."
 
   # Core
   python-2.7-core:
@@ -25,10 +25,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py27-core'
+          command: "cd packages/python/plotly; tox -e py27-core"
           no_output_timeout: 20m
 
   python-3.5-core:
@@ -41,10 +41,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py35-core'
+          command: "cd packages/python/plotly; tox -e py35-core"
           no_output_timeout: 20m
 
   python-3.6-core:
@@ -57,10 +57,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py36-core'
+          command: "cd packages/python/plotly; tox -e py36-core"
           no_output_timeout: 20m
 
   python-3.7-core:
@@ -73,10 +73,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py37-core'
+          command: "cd packages/python/plotly; tox -e py37-core"
           no_output_timeout: 20m
 
   python-3.7-percy:
@@ -122,14 +122,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
-      - run:
-          name: Install npm dependencies
-          command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
-          no_output_timeout: 20m
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py27-optional'
+          command: "cd packages/python/plotly; tox -e py27-optional"
           no_output_timeout: 20m
 
   python-3.5-optional:
@@ -142,14 +138,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
-      - run:
-          name: Install npm dependencies
-          command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
-          no_output_timeout: 20m
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py35-optional'
+          command: "cd packages/python/plotly; tox -e py35-optional"
           no_output_timeout: 20m
 
   python-3.6-optional:
@@ -162,14 +154,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
-      - run:
-          name: Install npm dependencies
-          command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
-          no_output_timeout: 20m
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py36-optional'
+          command: "cd packages/python/plotly; tox -e py36-optional"
           no_output_timeout: 20m
 
   python-3.7-optional:
@@ -182,14 +170,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
-      - run:
-          name: Install npm dependencies
-          command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
-          no_output_timeout: 20m
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/plotly; tox -e py37-optional'
+          command: "cd packages/python/plotly; tox -e py37-optional"
           no_output_timeout: 20m
 
   # Plot.ly
@@ -203,10 +187,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/chart-studio; tox -e py27-plot_ly'
+          command: "cd packages/python/chart-studio; tox -e py27-plot_ly"
           no_output_timeout: 20m
 
   python-3.5-plot_ly:
@@ -219,10 +203,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/chart-studio; tox -e py35-plot_ly'
+          command: "cd packages/python/chart-studio; tox -e py35-plot_ly"
           no_output_timeout: 20m
 
   python-3.7-plot_ly:
@@ -235,10 +219,10 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install tox'
+          command: "sudo pip install tox"
       - run:
           name: Test with tox
-          command: 'cd packages/python/chart-studio; tox -e py37-plot_ly'
+          command: "cd packages/python/chart-studio; tox -e py37-plot_ly"
           no_output_timeout: 20m
 
   python-2-7-orca:
@@ -269,7 +253,7 @@ jobs:
             pytest packages/python/plotly/plotly/tests/test_orca
 
       - store_artifacts:
-            path: plotly/tests/test_orca/images/linux/failed
+          path: plotly/tests/test_orca/images/linux/failed
 
   python-3-5-orca:
     docker:
@@ -299,7 +283,7 @@ jobs:
             pytest packages/python/plotly/plotly/tests/test_orca
 
       - store_artifacts:
-            path: plotly/tests/test_orca/images/linux/failed
+          path: plotly/tests/test_orca/images/linux/failed
 
   python-3-7-orca:
     docker:
@@ -325,11 +309,12 @@ jobs:
           command: |
             . /home/circleci/miniconda/etc/profile.d/conda.sh
             conda activate circle_optional
+            pytest --doctest-modules --ignore packages/python/plotly/plotly/tests --ignore packages/python/plotly/plotly/matplotlylib/mplexporter/tests packages/python/plotly/plotly
             pytest --disable-warnings packages/python/plotly/plotly/tests/test_core
             pytest packages/python/plotly/plotly/tests/test_orca
 
       - store_artifacts:
-            path: plotly/tests/test_orca/images/linux/failed
+          path: plotly/tests/test_orca/images/linux/failed
 
   plotlyjs_dev_build:
     docker:
@@ -342,13 +327,13 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: 'sudo pip install retrying tox black inflect'
+          command: "sudo pip install retrying tox black inflect"
       - run:
           name: Update jupyterlab-plotly version
-          command: 'cd packages/python/plotly; python setup.py updateplotlywidgetversion'
+          command: "cd packages/python/plotly; python setup.py updateplotlywidgetversion"
       - run:
           name: Update plotly.js to dev
-          command: 'cd packages/python/plotly; python setup.py updateplotlyjsdev'
+          command: "cd packages/python/plotly; python setup.py updateplotlyjsdev"
       - run:
           name: Test with tox
           command: |
@@ -384,6 +369,122 @@ jobs:
       - store_artifacts:
           path: packages/python/plotly/dist
 
+  build-doc:
+    resource_class: xlarge
+    docker:
+      # specify the version you desire here
+      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
+      - image: circleci/python:3.6.8-node
+
+        working_directory: ~/project
+
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "dc:5f:39:48:00:b4:72:34:e1:d2:c4:e1:1f:d1:e2:ce" #plotlydocbot
+
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "doc/requirements.txt" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            cd doc
+            python3 -m venv venv
+            . venv/bin/activate
+            npm install [email protected]
+            npm install orca
+            pip uninstall -y plotly
+            pip install -r requirements.txt
+            if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
+              pip uninstall -y plotly
+              cd ../packages/python/plotly
+              python3 setup.py install
+              cd ../../../doc
+            fi
+            echo 'export PATH="/home/circleci/project/doc/node_modules/.bin:$PATH"' >> $BASH_ENV
+            sudo apt-get install -y poppler-utils libxtst6 xvfb libgtk2.0-0 libgconf-2-4 libnss3 libasound2
+            cd ..
+
+      - save_cache:
+          paths:
+            - ./doc/venv
+            - ./doc/node_modules
+          key: v1-dependencies-{{ checksum "doc/requirements.txt" }}
+
+      - run:
+          name: make html
+          command: |
+            cd doc
+            . venv/bin/activate
+            echo ${mapbox_token} > python/.mapbox_token
+            make -kj8 || make -kj8
+            curl https://raw.githubusercontent.com/plotly/documentation/source-design-merge/front-matter-ci.py > front-matter-ci.py
+            curl https://raw.githubusercontent.com/plotly/documentation/source-design-merge/check-or-enforce-order.py > check-or-enforce-order.py
+            python front-matter-ci.py build/html
+            python check-or-enforce-order.py build/html
+            if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
+              cd build/html
+              git init
+              git config user.name plotlydocbot
+              git config user.email [email protected]
+              git add *
+              git commit -m "build of https://github.com/plotly/plotly.py/commit/${CIRCLE_SHA1}"
+              git push --force [email protected]:plotly/plotly.py-docs.git master:built
+              rm -rf .git
+              cd ../..
+            fi
+            tar -zcf build/html.tgz build/html
+            rm -rf build/html build/ipynb
+            cd ..
+
+      - run:
+          name: trigger doc build
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
+              git clone --depth=1 --branch=source-design-merge https://github.com/plotly/documentation.git
+              cd documentation
+              git config user.name plotlydocbot
+              git config user.email [email protected]
+              git commit --allow-empty -m "deploying https://github.com/plotly/plotly.py/commit/${CIRCLE_SHA1}"
+              git push
+              cd ..
+              rm -rf documentation
+            fi
+
+      - run:
+          name: make doc
+          command: |
+            cd doc
+            . venv/bin/activate
+            cd apidoc
+            make html
+            if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
+              cd _build/html
+              touch .nojekyll
+              git init
+              git config user.name plotlydocbot
+              git config user.email [email protected]
+              git add *
+              git add .nojekyll
+              git commit -m "build of https://github.com/plotly/plotly.py/commit/${CIRCLE_SHA1}"
+              git push --force [email protected]:plotly/plotly.py-docs.git master:gh-pages
+              rm -rf .git
+              cd ../..
+            fi
+
+            cd ../..
+
+      - store_artifacts:
+          path: doc/build
+          destination: doc/build
+
 workflows:
   version: 2
   code_formatting:
@@ -412,3 +513,4 @@ workflows:
       - python-2-7-orca
       - python-3-5-orca
       - python-3-7-orca
+      - build-doc

.circleci/create_conda_optional_env.sh

@@ -16,7 +16,7 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
     # Create environment
     # PYTHON_VERSION=3.6
     $HOME/miniconda/bin/conda create -n circle_optional --yes python=$PYTHON_VERSION \
-requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython
+requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets
 
     # Install orca into environment
     $HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca

.gitignore

@@ -43,3 +43,6 @@ plotly/tests/test_orca/images/*/tmp
 /plotly-package/plotly/tests/test_core/test_offline/plotly.min.js
 temp-plot.html
 .vscode
+doc/python/.ipynb_checkpoints
+doc/python/.mapbox_token
+doc/.ipynb_checkpoints