Skip to content

Commit 4102339

Browse files
Merge branch 'dev' into make-graph-height-more-responsive
2 parents 017c71c + a392f73 commit 4102339

File tree

162 files changed

+25783
-26104
lines changed

Some content is hidden

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

162 files changed

+25783
-26104
lines changed

.circleci/config.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,19 @@ 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
6161
no_output_timeout: 30m
62+
- run:
63+
name: Display npm errors and exit on failed builds
64+
command: |
65+
if [ -d "/home/circleci/.npm/_logs" ]
66+
then
67+
cat /home/circleci/.npm/_logs/*
68+
exit 1
69+
fi
6270
- save_cache:
6371
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
6472
paths:
@@ -111,8 +119,8 @@ jobs:
111119
. venv/bin/activate
112120
set -eo pipefail
113121
pip install -e . --progress-bar off && pip list | grep dash
114-
npm install --production && npm run initialize
115-
npm run build
122+
npm install npm run initialize
123+
npm run build.sequential
116124
npm run lint
117125
- run:
118126
name: 🐍 Python Unit Tests & ☕ JS Unit Tests
@@ -286,7 +294,7 @@ jobs:
286294
. venv/bin/activate && rm -rf components/dash-core-components/dash_core_components
287295
cd components/dash-core-components
288296
TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings)
289-
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
290298
- store_artifacts:
291299
path: ~/dash/components/dash-core-components/test-reports
292300
- store_test_results:
@@ -377,7 +385,7 @@ jobs:
377385
PERCY_ENABLE: 1
378386
PERCY_PARALLEL_TOTAL: -1
379387

380-
parallelism: 4
388+
parallelism: 5
381389

382390
steps:
383391
- checkout:

.husky/pre-commit

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
npm run lint
1+
npm run lint && \
2+
(cd components/dash-core-components && npm run lint) && \
3+
(cd components/dash-table && npm run lint)

@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"

0 commit comments

Comments
 (0)