Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 91 additions & 93 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- save_cache:
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }}
paths:
- venv
- venv
- run:
name: 🌸 Python & JS Lint
command: |
Expand All @@ -71,26 +71,26 @@ jobs:
npm run citest.unit

lint-unit-36:
<<: *lint-unit
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYLINTRC: .pylintrc
PYVERSION: python36
<<: *lint-unit
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYLINTRC: .pylintrc
PYVERSION: python36

lint-unit-27:
<<: *lint-unit
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYLINTRC: .pylintrc
PYVERSION: python27
<<: *lint-unit
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYLINTRC: .pylintrc
PYVERSION: python27

build-core-37: &build-core
working_directory: ~/dash
Expand All @@ -107,7 +107,7 @@ jobs:
- restore_cache:
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }}
- run:
name: ️️🏗️ pip dev requirements
name: 🏗️ pip dev requirements
command: |
sudo pip install --upgrade virtualenv
python -m venv venv || virtualenv venv && . venv/bin/activate
Expand All @@ -116,39 +116,39 @@ jobs:
- save_cache:
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }}
paths:
- venv
- venv
- run:
name: ️️🏗️ build core
command: |
. venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
cd dash-renderer && renderer 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 ci && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
ls -la packages
. venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
cd dash-renderer && renderer 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 ci && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
ls -la packages
- persist_to_workspace:
root: ~/dash
paths:
- packages/*.tar.gz

build-core-36:
<<: *build-core
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python36
<<: *build-core
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python36

build-core-27:
<<: *build-core
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python27
<<: *build-core
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python27

build-misc-37: &build-misc
working_directory: ~/dash
Expand All @@ -174,40 +174,40 @@ jobs:
- save_cache:
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }}
paths:
- venv
- venv
- run:
name: ️️🏗️ build misc
command: |
. venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
git clone --depth 1 https://github.com/plotly/dash-table.git
cd dash-table && npm ci && 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 ci && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
ls -la packages
. venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
git clone --depth 1 https://github.com/plotly/dash-table.git
cd dash-table && npm ci && 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 ci && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
ls -la packages
- persist_to_workspace:
root: ~/dash
paths:
- packages/*.tar.gz

build-misc-36:
<<: *build-misc
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python36
<<: *build-misc
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python36

build-misc-27:
<<: *build-misc
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python27
<<: *build-misc
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PYVERSION: python27

build-windows-37:
working_directory: ~/dash
Expand All @@ -222,10 +222,10 @@ jobs:
- run:
name: ️️🏗️ build core
command: |
pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
cd dash-renderer && renderer 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 ci && npm run build && python setup.py sdist && cd ..
pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
cd dash-renderer && renderer 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 ci && npm run build && python setup.py sdist && cd ..

build-dashr:
working_directory: ~/dashr
Expand All @@ -241,9 +241,8 @@ jobs:

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
name: 🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
Expand All @@ -259,7 +258,7 @@ jobs:
cd ../dash-table; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build); cd ..

- run:
name: 🔧fix up dash metadata
name: 🔧 fix up dash metadata
command: |
sudo Rscript dashR/tests/circleci/fixup_metadata.R

Expand All @@ -282,7 +281,7 @@ jobs:
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
name: 📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
Expand Down Expand Up @@ -331,7 +330,6 @@ jobs:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
Expand All @@ -358,7 +356,7 @@ jobs:
- attach_workspace:
at: ~/dash
- run:
name: ️️🏗️ Install packages
name: ️️🏗️ Install packages
command: |
. venv/bin/activate
npm install --production
Expand All @@ -384,26 +382,26 @@ jobs:
when: on_fail

test-36:
<<: *test
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PERCY_ENABLE: 0
PYVERSION: python36
<<: *test
docker:
- image: circleci/python:3.6.12-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PERCY_ENABLE: 0
PYVERSION: python36

test-27:
<<: *test
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PERCY_ENABLE: 0
PYVERSION: python27
<<: *test
docker:
- image: circleci/python:2.7.18-stretch-node-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
environment:
PERCY_ENABLE: 0
PYVERSION: python27

workflows:
version: 2
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ We do our best to catch bugs during the release process, but we rely on your hel


**Describe your context**
Please provide us your environment so we can easily reproduce the issue.
Please provide us your environment, so we can easily reproduce the issue.

- replace the result of `pip list | grep dash` below
```
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
- [ ] I have added entry in the `CHANGELOG.md`
- [ ] If this PR needs a follow-up in **dash docs**, **community thread**, I have mentioned the relevant URLS as follows
- [ ] this GitHub [#PR number]() updates the dash docs
- [ ] here is the show and tell thread in Plotly Dash community
- [ ] here is the show and tell thread in Plotly Dash community
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
## UNRELEASED

### Changed
- [#1531](https://github.com/plotly/dash/pull/1531) Update the format of the docstrings to make them easier to read in the reference pages of Dash Docs and in the console. This also addresses [#1205](https://github.com/plotly/dash/issues/1205)
- [#1531](https://github.com/plotly/dash/pull/1531) Update the format of the docstrings to make them easier to read in the reference pages of Dash Docs and in the console. This also addresses [#1205](https://github.com/plotly/dash/issues/1205)
- [#1553](https://github.com/plotly/dash/pull/1553) Increase the z-index of the Dash error menu from 1001 to 1100 in order to make sure it appears above Bootstrap components.

### Fixed
Expand All @@ -24,7 +24,7 @@ to close the error messages box.

### Fixed
- [#1530](https://github.com/plotly/dash/pull/1530) Dedent error messages more carefully.
- [#1527](https://github.com/plotly/dash/issues/1527)🐛 `get_asset_url` now pulls from an external source if `assets_external_path` is set.
- [#1527](https://github.com/plotly/dash/issues/1527) 🐛 `get_asset_url` now pulls from an external source if `assets_external_path` is set.
- updated `_add_assets_resource` to build asset urls the same way as `get_asset_url`.
- updated doc string for `assets_external_path` Dash argument to be more clear that it will allways be joined with the `assets_url_path` argument when determining the url to an external asset.
- [#1493](https://github.com/plotly/dash/pull/1493) Fix [#1143](https://github.com/plotly/dash/issues/1143), a bug where having a file with one of several common names (test.py, code.py, org.py, etc) that imports a dash component package would make `import dash` fail with a cryptic error message asking whether you have a file named "dash.py"
Expand Down Expand Up @@ -359,7 +359,7 @@ clientside JavaScript callbacks via inline strings.

- [#724](https://github.com/plotly/dash/pull/724), [renderer#175](https://github.com/plotly/dash-renderer/pull/175) Undo/redo toolbar is removed by default, you can enable it with `app=Dash(show_undo_redo=true)`. The CSS hack `._dash-undo-redo:{display:none;}` is no longer needed

- 💥[#709](https://github.com/plotly/dash/pull/709) Merge the `dash-renderer` project into the main dash repo to simplify feature dev workflow. We will keep the [deprecated one](https://github.com/plotly/dash-renderer) for archive purpose.
- 💥 [#709](https://github.com/plotly/dash/pull/709) Merge the `dash-renderer` project into the main dash repo to simplify feature dev workflow. We will keep the [deprecated one](https://github.com/plotly/dash-renderer) for archive purpose.

## [0.43.0] - 2019-05-15
### Changed
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $ pip list | grep dash

### Dash-Renderer Beginner Guide

`Dash Renderer` began as a separate repository. It was merged into the main `Dash` repository as part of the 1.0 release. It is the common frontend for all Dash backends (**R** and **Python**), and manages React Component layout and backend event handling.
`Dash Renderer` began as a separate repository. It was merged into the main `Dash` repository as part of the 1.0 release. It is the common frontend for all Dash backends (**R** and **Python**), and manages React Component layout and backend event handling.

If you want to contribute or simply dig deeper into Dash, we encourage you to play and taste it. This is the most efficient way to learn and understand everything under the hood.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function updateSelectedNode(cy, id) {
node.addClass('selected-node');

// Find the subtree that the node belongs to. A subtree contains
// all all ancestors and descendents that are connected via Inputs
// all all ancestors and descendants that are connected via Inputs
// or Outputs (but not State).

// WARNING: No cycle detection!
Expand Down
6 changes: 3 additions & 3 deletions dash/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"enabled": true
},
"pip_requirements": {
"fileMatch": ["requirements.txt", "dev-requirements.txt", "dev-requirements-py37.txt"]
"fileMatch": ["requirements.txt", "dev-requirements.txt", "dev-requirements-py37.txt"]
},
"pip_setup": {
"enabled": true
"enabled": true
},
"packageRules": [{
"packageNames": [
"pylint"
],
"paths": [
"dev-requirements.txt"
"dev-requirements.txt"
],
"allowedVersions": "<2.0.0"
}]
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/callbacks/test_prevent_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def test_cbpu002_multi_output_no_update(dash_duo):
[Input("btn", "n_clicks")],
)
def show_clicks(n):
# partial or complete cancelation of updates via no_update
# partial or complete cancellation of updates via no_update
return [
no_update if n and n > 4 else n,
no_update if n and n > 2 else n,
Expand Down
Loading