diff --git a/.circleci/config.yml b/.circleci/config.yml index e9f625b012..7317925f9a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,92 +1,166 @@ version: 2 - jobs: + "percy-finalize": + docker: + - image: percyio/agent + steps: + - run: percy finalize --all - "python-2.7": &test-template + "lint-unit-37": &lint-unit working_directory: ~/dash docker: - - image: circleci/python:2.7-stretch-node-browsers + - image: circleci/python:3.7-stretch-node-browsers environment: - PYLINTRC: .pylintrc + PYLINTRC: .pylintrc37 + PYVERSION: python37 steps: - checkout - - - run: - name: ℹī¸ CI Context - command: | - echo "TRIGGERER: ${CIRCLE_USERNAME}" - echo "BUILD_NUMBER: ${CIRCLE_BUILD_NUM}" - echo "BUILD_URL: ${CIRCLE_BUILD_URL}" - echo "BRANCH: ${CIRCLE_BRANCH}" - echo "RUNNING JOB: ${CIRCLE_JOB}" - echo "JOB PARALLELISM: ${CIRCLE_NODE_TOTAL}" - echo "CIRCLE_REPOSITORY_URL: ${CIRCLE_REPOSITORY_URL}" - echo $CIRCLE_JOB > circlejob.txt - + - run: echo $PYVERSION > ver.txt - restore_cache: - key: v-{{ checksum "circlejob.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} + key: dep-{{ checksum "ver.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} - run: name: 🚧 pip dev requirements command: | sudo pip install --upgrade virtualenv - python -m venv venv || virtualenv venv - . venv/bin/activate - pip install -r requires-install.txt -r requires-ci.txt -r requires-testing.txt --quiet + python -m venv venv || virtualenv venv && . venv/bin/activate + pip install -e . -r requires-install.txt -r requires-ci.txt -r requires-testing.txt --quiet - save_cache: - key: v-{{ checksum "circlejob.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} + key: dep-{{ checksum "ver.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} paths: - "venv" - - run: - name: 🌸 linting + name: 🌸 Python & JS Lint command: | . venv/bin/activate - pip install -e .[ci,testing] --quiet - pip list | grep dash - flake8 dash setup.py - flake8 --ignore=E123,E126,E501,E722,E731,F401,F841,W503,W504 --exclude=metadata_test.py tests + pip install -e . --quiet && pip list | grep dash + flake8 dash setup.py && flake8 --ignore=E123,E126,E501,E722,E731,F401,F841,W503,W504 --exclude=metadata_test.py tests pylint dash setup.py --rcfile=$PYLINTRC pylint tests/unit tests/integration/devtools tests/integration/renderer tests/integration/dash_assets -d all -e C0410,C0411,C0412,C0413,W0109 cd dash-renderer && npm install --ignore-scripts && npm run lint:test && npm run format:test - - run: - name: ⛑ Run unit tests + name: ⛑ Unit Tests command: | . venv/bin/activate - mkdir test-reports - PYTHONPATH=~/dash/tests/assets pytest --junitxml=test-reports/junit.xml tests/unit - - store_test_results: - path: test-reports - - store_artifacts: - path: test-reports + PYTHONPATH=~/dash/tests/assets pytest tests/unit + "lint-unit-36": + <<: *lint-unit + docker: + - image: circleci/python:3.6-stretch-node-browsers + environment: + PYLINTRC: .pylintrc + PYVERSION: python36 + + "lint-unit-27": + <<: *lint-unit + docker: + - image: circleci/python:2.7-stretch-node-browsers + environment: + PYLINTRC: .pylintrc + PYVERSION: python27 + + "build-core-37": &build-core + working_directory: ~/dash + docker: + - image: circleci/python:3.7-stretch-node-browsers + environment: + PYVERSION: python37 + steps: + - checkout + - run: echo $PYVERSION > ver.txt + - restore_cache: + key: dep-{{ checksum "ver.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} - run: - name: 🚧 build renderer + name: 🚧 build core command: | - . venv/bin/activate - cd dash-renderer - npm install --ignore-scripts && npm run build:dev && npm run build - pip install -e . --quiet + . venv/bin/activate && pip install --upgrade -e . --quiet && mkdir packages + python setup.py sdist && mv dist/* packages/ + cd dash-renderer && npm install --ignore-scripts && npm run build:dev && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd .. + git clone --depth 1 https://github.com/plotly/dash-core-components.git + cd dash-core-components && npm install --ignore-scripts && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd .. + git clone --depth 1 https://github.com/plotly/dash-renderer-test-components + cd dash-renderer-test-components && npm install --ignore-scripts && npm run build:all && python setup.py sdist && mv dist/* ../packages/ && cd .. + - persist_to_workspace: + root: ~/dash + paths: + - packages + + "build-core-36": + <<: *build-core + docker: + - image: circleci/python:3.6-stretch-node-browsers + environment: + PYVERSION: python36 + + "build-core-27": + <<: *build-core + docker: + - image: circleci/python:2.7-stretch-node-browsers + environment: + PYVERSION: python27 + + "build-misc-37": &build-misc + working_directory: ~/dash + docker: + - image: circleci/python:3.7-stretch-node-browsers + environment: + PYVERSION: python37 + steps: + - checkout + - run: echo $PYVERSION > ver.txt + - restore_cache: + key: dep-{{ checksum "ver.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} - run: - name: 🚧 install dependencies from latest master commit + name: 🚧 build misc command: | - git clone --depth 1 https://github.com/plotly/dash-core-components.git - git clone --depth 1 https://github.com/plotly/dash-html-components.git + . venv/bin/activate && pip install --upgrade -e . --quiet && mkdir packages git clone --depth 1 https://github.com/plotly/dash-table.git - git clone --depth 1 https://github.com/plotly/dash-renderer-test-components - . venv/bin/activate - cd dash-core-components && npm install --ignore-scripts && npm run build && pip install -e . && cd .. - cd dash-html-components && npm install --ignore-scripts && npm run build && pip install -e . && cd .. - cd dash-table && npm install --ignore-scripts && npm run build && pip install -e . && cd .. - cd dash-renderer-test-components && npm install --ignore-scripts && npm run build:all && pip install -e . && cd .. + cd dash-table && npm install --ignore-scripts && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd .. + git clone --depth 1 https://github.com/plotly/dash-html-components.git + cd dash-html-components && npm install --ignore-scripts && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd .. + - persist_to_workspace: + root: ~/dash + paths: + - packages + "build-misc-36": + <<: *build-misc + docker: + - image: circleci/python:3.6-stretch-node-browsers + environment: + PYVERSION: python36 + + "build-misc-27": + <<: *build-misc + docker: + - image: circleci/python:2.7-stretch-node-browsers + environment: + PYVERSION: python27 + + "test-37": &test + working_directory: ~/dash + docker: + - image: circleci/python:3.7-stretch-node-browsers + environment: + PERCY_PARALLEL_TOTAL: '-1' + PYVERSION: python37 + parallelism: 3 + steps: + - checkout + - run: echo $PYVERSION > ver.txt + - restore_cache: + key: dep-{{ checksum "ver.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} + - attach_workspace: + at: ~/dash - run: - name: ⚙ī¸ run integration test + name: ⚙ī¸ Run Integration Tests command: | . venv/bin/activate - pytest --junitxml=test-reports/junit_intg.xml tests/integration/ + cd packages && ls -la && pip install * && cd .. && pip list | grep dash + TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings) + pytest --headless --durations=10 --junitxml=test-reports/junit_intg.xml ${TESTFILES} - store_artifacts: path: test-reports - store_test_results: @@ -94,28 +168,51 @@ jobs: - store_artifacts: path: /tmp/dash_artifacts + "test-36": + <<: *test + docker: + - image: circleci/python:3.6-stretch-node-browsers + environment: + PERCY_ENABLE: '0' + PYVERSION: python36 - "python-3.6": - <<: *test-template - docker: - - image: circleci/python:3.6-stretch-node-browsers - environment: - PYLINTRC: .pylintrc - PERCY_ENABLE: 0 - - "python-3.7": - <<: *test-template - docker: - - image: circleci/python:3.7-stretch-node-browsers - environment: - PYLINTRC: .pylintrc37 - PERCY_ENABLE: 0 - + "test-27": + <<: *test + docker: + - image: circleci/python:2.7-stretch-node-browsers + environment: + PERCY_ENABLE: '0' + PYVERSION: python27 workflows: version: 2 - build: + python3.7: + jobs: + - lint-unit-37 + - build-core-37 + - build-misc-37 + - "test-37": + requires: + - build-core-37 + - build-misc-37 + - "percy-finalize": + requires: + - test-37 + python3.6: + jobs: + - lint-unit-36 + - build-core-36 + - build-misc-36 + - "test-36": + requires: + - build-core-36 + - build-misc-36 + python2.7: jobs: - - "python-2.7" - - "python-3.6" - - "python-3.7" + - lint-unit-27 + - build-core-27 + - build-misc-27 + - "test-27": + requires: + - build-core-27 + - build-misc-27 \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 73fe3d99fb..7891381044 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ $ pip install -r .circleci/requirements/dev-requirements.txt ``` ## Git -Use the [GitHub flow][] when proposing contributions to this repository (i.e. create a feature branch and submit a PR against the **dev** branch). +Use the [GitHub flow][] when proposing contributions to this repository (i.e. create a feature branch and submit a PR against the default branch). ### Organize your commits @@ -63,7 +63,7 @@ Emojis make the commit messages :cherry_blossom:. If you have no idea about what We use both `flake8` and `pylint` for basic linting check, please refer to the relevant steps in `.circleci/config.yml`. -Note that we also start using [`black`](https://black.readthedocs.io/en/stable/) as formatter during the test code migration. +Note that we also start using [`black`](https://black.readthedocs.io/en/stable/) as formatter during the test code migration. ## Tests diff --git a/dash/testing/browser.py b/dash/testing/browser.py index 2271964743..b7bd53b58b 100644 --- a/dash/testing/browser.py +++ b/dash/testing/browser.py @@ -72,11 +72,8 @@ def __enter__(self): def __exit__(self, exc_type, exc_val, traceback): try: self.driver.quit() - self.percy_runner.finalize_build() except WebDriverException: logger.exception("webdriver quit was not successful") - except percy.errors.Error: - logger.exception("percy runner failed to finalize properly") def percy_snapshot(self, name=""): """percy_snapshot - visual test api shortcut to `percy_runner.snapshot` diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 83fb91c302..c9551c68b0 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -680,7 +680,7 @@ def update_output(value): assert dash_duo.find_element("#output-pre").text == "request_pre!!!" assert dash_duo.find_element("#output-post").text == "request_post ran!" - dash_duo.percy_snapshot(name="request-hooks") + dash_duo.percy_snapshot(name="request-hooks intg") def test_inin015_with_custom_renderer_interpolated(dash_duo): diff --git a/tests/integration/test_race_conditions.py b/tests/integration/test_race_conditions.py index dd1ea8c6c6..b597068e3c 100644 --- a/tests/integration/test_race_conditions.py +++ b/tests/integration/test_race_conditions.py @@ -2,10 +2,10 @@ import time import flask -from dash import Dash -from dash.dependencies import Input, Output import dash_html_components as html import dash_core_components as dcc +from dash import Dash +from dash.dependencies import Input, Output from .IntegrationTests import IntegrationTests from .utils import wait_for @@ -16,7 +16,7 @@ def setUp(self): pass -DELAY_TIME = 1 +DELAY_TIME = 0.2 def create_race_conditions_test(endpoints): diff --git a/tests/integration/test_render.py b/tests/integration/test_render.py index e72558c5ba..5c5d56c3c1 100644 --- a/tests/integration/test_render.py +++ b/tests/integration/test_render.py @@ -957,7 +957,7 @@ def update_output(value): self.wait_for_text_to_equal('#output-post', 'request_post changed this text!') self.wait_for_text_to_equal('#output-post-payload', '{"output":"output-1.children","changedPropIds":["input.value"],"inputs":[{"id":"input","property":"value","value":"fire request hooks"}]}') self.wait_for_text_to_equal('#output-post-response', '{"props":{"children":"fire request hooks"}}') - self.percy_snapshot(name='request-hooks') + self.percy_snapshot(name='request-hooks render') def test_graphs_in_tabs_do_not_share_state(self): app = dash.Dash()