Skip to content

Commit ef397ce

Browse files
Merge branch 'dev' into fix/style-header-conditional
2 parents 8e906c7 + 4b03e5a commit ef397ce

File tree

122 files changed

+15592
-15892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+15592
-15892
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
pip install -e .[ci,dev,testing,celery,diskcache] --progress-bar off
5555
pip list | grep dash
5656
npm i
57-
npm run build
57+
npm run build.sequential
5858
python setup.py sdist
5959
mkdir dash-package && cp dist/*.tar.gz dash-package/dash-package.tar.gz
6060
ls -la dash-package
@@ -120,7 +120,7 @@ jobs:
120120
set -eo pipefail
121121
pip install -e . --progress-bar off && pip list | grep dash
122122
npm install npm run initialize
123-
npm run build
123+
npm run build.sequential
124124
npm run lint
125125
- run:
126126
name: 🐍 Python Unit Tests & ☕ JS Unit Tests
@@ -294,7 +294,7 @@ jobs:
294294
. venv/bin/activate && rm -rf components/dash-core-components/dash_core_components
295295
cd components/dash-core-components
296296
TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings)
297-
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES}
297+
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES} --reruns 3
298298
- store_artifacts:
299299
path: ~/dash/components/dash-core-components/test-reports
300300
- store_test_results:
@@ -385,7 +385,7 @@ jobs:
385385
PERCY_ENABLE: 1
386386
PERCY_PARALLEL_TOTAL: -1
387387

388-
parallelism: 4
388+
parallelism: 5
389389

390390
steps:
391391
- checkout:

@plotly/dash-component-plugins/package-lock.json

Lines changed: 1438 additions & 1299 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@plotly/dash-component-plugins/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@plotly/dash-component-plugins",
3-
"version": "1.2.2",
3+
"version": "1.2.3",
44
"description": "Plugins for Dash Components",
55
"repository": {
66
"type": "git",
@@ -17,13 +17,13 @@
1717
"author": "Marc-André Rivet",
1818
"license": "MIT",
1919
"devDependencies": {
20-
"@babel/core": "^7.16.0",
21-
"@babel/preset-env": "^7.16.4",
22-
"@babel/preset-react": "^7.16.0",
23-
"babel-loader": "^8.2.3",
20+
"@babel/core": "^7.17.9",
21+
"@babel/preset-env": "^7.16.11",
22+
"@babel/preset-react": "^7.16.7",
23+
"babel-loader": "^8.2.4",
2424
"react": "^16.8.6",
2525
"webpack": "^4.44.2",
26-
"webpack-cli": "^4.9.1"
26+
"webpack-cli": "^4.9.2"
2727
},
2828
"files": [
2929
"dist/index.js"

@plotly/dash-generator-test-component-nested/package-lock.json

Lines changed: 1621 additions & 1448 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@plotly/dash-generator-test-component-nested/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
"author": "Chris Parmer <[email protected]>",
1717
"license": "MIT",
1818
"dependencies": {
19-
"prop-types": "^15.7.2",
19+
"prop-types": "^15.8.1",
2020
"react-docgen": "^5.4.0"
2121
},
2222
"devDependencies": {
23-
"@babel/cli": "^7.16.0",
24-
"@babel/core": "^7.16.0",
25-
"@babel/preset-env": "^7.16.4",
26-
"@babel/preset-react": "^7.16.0",
27-
"babel-loader": "^8.2.3",
23+
"@babel/cli": "^7.17.6",
24+
"@babel/core": "^7.17.9",
25+
"@babel/preset-env": "^7.16.11",
26+
"@babel/preset-react": "^7.16.7",
27+
"babel-loader": "^8.2.4",
2828
"npm-run-all": "^4.1.5",
2929
"react": "16.13.0",
3030
"react-dom": "16.13.0",
3131
"react-jsx-parser": "1.28.1",
3232
"webpack": "^4.44.2",
33-
"webpack-cli": "^4.9.1"
33+
"webpack-cli": "^4.9.2"
3434
},
3535
"peerDependencies": {
3636
"react": "^16.13.0",

0 commit comments

Comments
 (0)