Skip to content

Commit ff8c155

Browse files
authored
Merge branch 'dev' into jl-nested-component-generator
2 parents 0b39bd5 + e7f4984 commit ff8c155

38 files changed

+927
-1229
lines changed

.circleci/config.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
artifacts:
1515
docker:
16-
- image: circleci/python:3.7.6-stretch-node-browsers
16+
- image: circleci/python:3.7.9-stretch-node-browsers
1717
auth:
1818
username: dashautomation
1919
password: $DASH_PAT_DOCKERHUB
@@ -33,7 +33,7 @@ jobs:
3333
lint-unit-37: &lint-unit
3434
working_directory: ~/dash
3535
docker:
36-
- image: circleci/python:3.7.6-stretch-node-browsers
36+
- image: circleci/python:3.7.9-stretch-node-browsers
3737
auth:
3838
username: dashautomation
3939
password: $DASH_PAT_DOCKERHUB
@@ -73,7 +73,7 @@ jobs:
7373
lint-unit-36:
7474
<<: *lint-unit
7575
docker:
76-
- image: circleci/python:3.6.9-stretch-node-browsers
76+
- image: circleci/python:3.6.12-stretch-node-browsers
7777
auth:
7878
username: dashautomation
7979
password: $DASH_PAT_DOCKERHUB
@@ -95,7 +95,7 @@ jobs:
9595
build-core-37: &build-core
9696
working_directory: ~/dash
9797
docker:
98-
- image: circleci/python:3.7.6-stretch-node-browsers
98+
- image: circleci/python:3.7.9-stretch-node-browsers
9999
auth:
100100
username: dashautomation
101101
password: $DASH_PAT_DOCKERHUB
@@ -133,7 +133,7 @@ jobs:
133133
build-core-36:
134134
<<: *build-core
135135
docker:
136-
- image: circleci/python:3.6.9-stretch-node-browsers
136+
- image: circleci/python:3.6.12-stretch-node-browsers
137137
auth:
138138
username: dashautomation
139139
password: $DASH_PAT_DOCKERHUB
@@ -153,7 +153,7 @@ jobs:
153153
build-misc-37: &build-misc
154154
working_directory: ~/dash
155155
docker:
156-
- image: circleci/python:3.7.6-stretch-node-browsers
156+
- image: circleci/python:3.7.9-stretch-node-browsers
157157
auth:
158158
username: dashautomation
159159
password: $DASH_PAT_DOCKERHUB
@@ -192,7 +192,7 @@ jobs:
192192
build-misc-36:
193193
<<: *build-misc
194194
docker:
195-
- image: circleci/python:3.6.9-stretch-node-browsers
195+
- image: circleci/python:3.6.12-stretch-node-browsers
196196
auth:
197197
username: dashautomation
198198
password: $DASH_PAT_DOCKERHUB
@@ -341,7 +341,7 @@ jobs:
341341
test-37: &test
342342
working_directory: ~/dash
343343
docker:
344-
- image: circleci/python:3.7.6-stretch-node-browsers
344+
- image: circleci/python:3.7.9-stretch-node-browsers
345345
auth:
346346
username: dashautomation
347347
password: $DASH_PAT_DOCKERHUB
@@ -386,7 +386,7 @@ jobs:
386386
test-36:
387387
<<: *test
388388
docker:
389-
- image: circleci/python:3.6.9-stretch-node-browsers
389+
- image: circleci/python:3.6.12-stretch-node-browsers
390390
auth:
391391
username: dashautomation
392392
password: $DASH_PAT_DOCKERHUB

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# These owners will be the default owners for everything in
22
# the repo. Unless a later match takes precedence
3-
* @alexcjohnson @Marc-Andre-Rivet
4-
5-
_r_* @alexcjohnson @Marc-Andre-Rivet @rpkyle
3+
* @alexcjohnson @Marc-Andre-Rivet @rpkyle

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
### optionals
1212

1313
- [ ] I have added entry in the `CHANGELOG.md`
14-
- [ ] If this PR needs a follow-up in **dash docs**, **community thread**, I have mentioned the relevant URLS as follow
15-
- [ ] this github [#PR number]() updates the dash docs
16-
- [ ] here is the show and tell thread in plotly dash community
14+
- [ ] If this PR needs a follow-up in **dash docs**, **community thread**, I have mentioned the relevant URLS as follows
15+
- [ ] this GitHub [#PR number]() updates the dash docs
16+
- [ ] here is the show and tell thread in Plotly Dash community

.pylintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ disable=fixme,
6161
old-style-class,
6262
superfluous-parens,
6363
bad-continuation,
64-
line-too-long
64+
line-too-long,
65+
bad-option-value
6566

6667

6768
# Enable the message, report, category or checker with the given id(s). You can

.pylintrc37

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ disable=invalid-name,
149149
too-many-lines,
150150
too-many-statements,
151151
bad-continuation,
152-
line-too-long
152+
line-too-long,
153+
super-with-arguments,
154+
raise-missing-from,
155+
bad-option-value
153156

154157
# Enable the message, report, category or checker with the given id(s). You can
155158
# either give multiple identifier separated by comma (,) or put this option

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
All notable changes to `dash` will be documented in this file.
33
This project adheres to [Semantic Versioning](https://semver.org/).
44

5+
## [UNRELEASED]
6+
### Changed
7+
- [#1503](https://github.com/plotly/dash/pull/1506) Fix [#1466](https://github.com/plotly/dash/issues/1466): loosen `dash[testing]` requirements for easier integration in external projects. This PR also bumps many `dash[dev]` requirements.
8+
9+
### Fixed
10+
- [#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"
11+
12+
## [1.18.1] - 2020-12-09
13+
14+
## [1.18.0] - 2020-12-07
15+
516
## [1.17.0] - 2020-10-29
617
### Changed
718
- [#1442](https://github.com/plotly/dash/pull/1442) Update from React 16.13.0 to 16.14.0

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ Built on top of Plotly.js, React and Flask, Dash ties modern UI elements like dr
1414

1515
- [User Guide](https://dash.plotly.com/getting-started)
1616

17-
- [Offline (PDF) Documentation](https://github.com/plotly/dash-docs/blob/master/pdf-docs/Dash_User_Guide_and_Documentation.pdf)
18-
1917
- [Dash Docs on Heroku](https://dash-docs.herokuapp.com/) (for corporate network that cannot access plotly.com)
2018

2119
- [Open-Source App Gallery](https://dash-gallery.plotly.host/Portal/) With sample code and templates!

dash-renderer/src/components/error/CallbackGraph/CallbackGraphContainer.react.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Cytoscape.use(dagre);
2424
Cytoscape.use(fcose);
2525

2626
/*
27-
* Generates all the elements (nodes, edeges) for the dependency graph.
27+
* Generates all the elements (nodes, edges) for the dependency graph.
2828
*/
2929
function generateElements(graphs, profile, extraLinks) {
3030
const consumed = [];
@@ -229,7 +229,7 @@ function CallbackGraph() {
229229
};
230230
}
231231

232-
// Adds callbacks once cyctoscape is intialized.
232+
// Adds callbacks once cyctoscape is initialized.
233233
useCytoscapeEffect(
234234
cy => {
235235
cytoscape.on('tap', 'node', e => setSelected(e.target));

dash-renderer/src/components/error/CallbackGraph/CallbackGraphEffects.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {STATUS, STATUSMAP} from '../../../constants/constants';
66
* Finds all edges connected to a node and splits them by type.
77
*
88
* @param {Object} node - Cytoscape node.
9-
* @returns {Object} - Object contaiing the edges, sorted by type.
9+
* @returns {Object} - Object containing the edges, sorted by type.
1010
*/
1111
function getEdgeTypes(node) {
1212
const elements = node.connectedEdges();
@@ -30,7 +30,7 @@ export function updateSelectedNode(cy, id) {
3030
if (id) {
3131
const node = cy.getElementById(id);
3232

33-
// Highlght the selected node.
33+
// Highlight the selected node.
3434

3535
node.addClass('selected-node');
3636

@@ -112,7 +112,7 @@ export function updateChangedProps(cy, id, props, flashTime = 500) {
112112
*
113113
* @param {Object} cy - Reference to the cytoscape instance.
114114
* @param {String} id - The id of the callback (i.e., it's output identifier)
115-
* @param {Object} profile - The callback profiling infomration.
115+
* @param {Object} profile - The callback profiling information.
116116
* @param {Number} flashTime - The time to flash classes for in ms.
117117
* @returns {undefined}
118118
*/

dash-renderer/src/observers/prioritizedCallbacks.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const observer: IStoreObserverDefinition<IStoreState> = {
114114
}
115115

116116
if (pickedAsyncCallbacks.length) {
117-
const deffered = map<IPrioritizedCallback, IBlockedCallback>(
117+
const deferred = map<IPrioritizedCallback, IBlockedCallback>(
118118
cb => ({
119119
...cb,
120120
...getStash(cb, paths),
@@ -126,7 +126,7 @@ const observer: IStoreObserverDefinition<IStoreState> = {
126126
dispatch(
127127
aggregateCallbacks([
128128
removePrioritizedCallbacks(pickedAsyncCallbacks),
129-
addBlockedCallbacks(deffered)
129+
addBlockedCallbacks(deferred)
130130
])
131131
);
132132

@@ -165,7 +165,7 @@ const observer: IStoreObserverDefinition<IStoreState> = {
165165
addExecutingCallbacks([executingCallback])
166166
])
167167
);
168-
}, deffered);
168+
}, deferred);
169169
}
170170
},
171171
inputs: ['callbacks.prioritized', 'callbacks.completed']

0 commit comments

Comments
 (0)