Skip to content

Commit 832ab4d

Browse files
committed
Merge remote-tracking branch 'remote/dev' into support-async-callbacks
# Conflicts: # dash/_callback.py # dash/dash.py
2 parents eb96c5d + 9add5c1 commit 832ab4d

File tree

145 files changed

+8211
-4641
lines changed

Some content is hidden

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

145 files changed

+8211
-4641
lines changed

.circleci/config.yml

Lines changed: 12 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ orbs:
99
jobs:
1010
artifacts:
1111
docker:
12-
- image: cimg/python:3.12.1
12+
- image: cimg/python:3.12.10
1313
auth:
1414
username: dashautomation
1515
password: $DASH_PAT_DOCKERHUB
@@ -31,7 +31,7 @@ jobs:
3131
install-dependencies-312: &install-dependencies
3232
working_directory: ~/dash
3333
docker:
34-
- image: cimg/python:3.12.1-node
34+
- image: cimg/python:3.12.10-node
3535
auth:
3636
username: dashautomation
3737
password: $DASH_PAT_DOCKERHUB
@@ -49,7 +49,8 @@ jobs:
4949
name: 🏁 Build Component Packages & Update Dependencies/Artifacts
5050
command: |
5151
python -m venv venv && . venv/bin/activate
52-
pip install --upgrade pip wheel setuptools
52+
pip install "pip<25.0"
53+
pip install --upgrade wheel setuptools
5354
set -eo pipefail
5455
pip install -e .[ci,dev,testing,celery,diskcache] --progress-bar off
5556
pip list | grep dash
@@ -89,7 +90,7 @@ jobs:
8990
lint-unit-312: &lint-unit
9091
working_directory: ~/dash
9192
docker:
92-
- image: cimg/python:3.12.1-browsers
93+
- image: cimg/python:3.12.10-browsers
9394
auth:
9495
username: dashautomation
9596
password: $DASH_PAT_DOCKERHUB
@@ -175,7 +176,7 @@ jobs:
175176
test-312: &test
176177
working_directory: ~/dash
177178
docker:
178-
- image: cimg/python:3.12.1-browsers
179+
- image: cimg/python:3.12.10-browsers
179180
auth:
180181
username: dashautomation
181182
password: $DASH_PAT_DOCKERHUB
@@ -184,11 +185,6 @@ jobs:
184185
PERCY_PARALLEL_TOTAL: -1
185186
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
186187
PYVERSION: python312
187-
REDIS_URL: redis://localhost:6379
188-
- image: cimg/redis:6.2.6
189-
auth:
190-
username: dashautomation
191-
password: $DASH_PAT_DOCKERHUB
192188
parallelism: 3
193189
steps:
194190
- checkout:
@@ -200,6 +196,7 @@ jobs:
200196
sudo apt-get update
201197
- run: echo $PYVERSION > ver.txt
202198
- run: cat requirements/*.txt > requirements-all.txt
199+
- run: cat requirements-all.txt
203200
- restore_cache:
204201
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
205202
- browser-tools/install-browser-tools:
@@ -212,9 +209,10 @@ jobs:
212209
name: ️️🏗️ Install package
213210
command: |
214211
. venv/bin/activate
212+
pip install "pip<25"
215213
npm ci
216214
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
217-
pip list | grep dash
215+
pip list
218216
- run:
219217
name: 🧪 Run Integration Tests
220218
command: |
@@ -293,16 +291,11 @@ jobs:
293291
PERCY_ENABLE: 0
294292
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
295293
PYVERSION: python38
296-
REDIS_URL: redis://localhost:6379
297-
- image: cimg/redis:6.2.6
298-
auth:
299-
username: dashautomation
300-
password: $DASH_PAT_DOCKERHUB
301294

302295
dcc-lint-unit-312: &dcc-lint-unit
303296
working_directory: ~/dash
304297
docker:
305-
- image: cimg/python:3.12.1-node
298+
- image: cimg/python:3.12.10-node
306299
auth:
307300
username: dashautomation
308301
password: $DASH_PAT_DOCKERHUB
@@ -339,7 +332,7 @@ jobs:
339332
dcc-312: &dcc-test
340333
working_directory: ~/dash
341334
docker:
342-
- image: cimg/python:3.12.1-browsers
335+
- image: cimg/python:3.12.10-browsers
343336
auth:
344337
username: dashautomation
345338
password: $DASH_PAT_DOCKERHUB
@@ -400,7 +393,7 @@ jobs:
400393
html-312: &html-test
401394
working_directory: ~/dash
402395
docker:
403-
- image: cimg/python:3.12.1-browsers
396+
- image: cimg/python:3.12.10-browsers
404397
auth:
405398
username: dashautomation
406399
password: $DASH_PAT_DOCKERHUB
@@ -466,105 +459,6 @@ jobs:
466459
PYVERSION: python38
467460
PERCY_ENABLE: 0
468461

469-
table-server: &table-server
470-
working_directory: ~/dash
471-
docker:
472-
- image: cimg/python:3.12.1-browsers
473-
environment:
474-
PYVERSION: python312
475-
PERCY_ENABLE: 1
476-
PERCY_PARALLEL_TOTAL: -1
477-
478-
parallelism: 5
479-
480-
steps:
481-
- checkout:
482-
path: ~/dash
483-
- run:
484-
name: Add chrome keys & update.
485-
command: |
486-
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
487-
sudo apt-get update
488-
- run: echo $PYVERSION > ver.txt
489-
- run: cat requirements/*.txt > requirements-all.txt
490-
- restore_cache:
491-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
492-
- browser-tools/install-browser-tools:
493-
chrome-version: 120.0.6099.71
494-
install-firefox: false
495-
install-geckodriver: false
496-
- attach_workspace:
497-
at: ~/dash
498-
- run:
499-
name: ️️🏗️ Install package
500-
command: |
501-
. venv/bin/activate
502-
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
503-
pip list | grep dash
504-
- run:
505-
name: Inject Percy Environment variables
506-
command: |
507-
echo 'export PERCY_TOKEN="$PERCY_TOKEN"' >> $BASH_ENV
508-
- run:
509-
name: Run tests
510-
command: |
511-
. venv/bin/activate
512-
cd components/dash-table
513-
TESTFILES=$(circleci tests glob "tests/selenium/**/test_*.py" | circleci tests split --split-by=timings)
514-
pytest --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-table" ${TESTFILES}
515-
- store_artifacts:
516-
path: ~/dash/components/dash-table/test-reports
517-
- store_test_results:
518-
path: ~/dash/components/dash-table/test-reports
519-
- store_artifacts:
520-
path: /tmp/dash_artifacts
521-
522-
table-unit-test:
523-
working_directory: ~/dash
524-
docker:
525-
- image: cimg/python:3.12.1-browsers
526-
environment:
527-
PYVERSION: python312
528-
PERCY_ENABLE: 0
529-
steps:
530-
- checkout:
531-
path: ~/dash
532-
- run:
533-
name: Add chrome keys & update.
534-
command: |
535-
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
536-
sudo apt-get update
537-
- run: echo $PYVERSION > ver.txt
538-
- run: cat requirements/*.txt > requirements-all.txt
539-
- restore_cache:
540-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
541-
- restore_cache:
542-
key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
543-
- browser-tools/install-browser-tools:
544-
chrome-version: 120.0.6099.71
545-
install-firefox: false
546-
install-geckodriver: false
547-
- attach_workspace:
548-
at: ~/dash
549-
- run:
550-
name: ️️🏗️ Install package and table deps
551-
command: |
552-
. venv/bin/activate
553-
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
554-
pip list | grep dash
555-
cd components/dash-table
556-
npm ci
557-
- save_cache:
558-
key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
559-
paths:
560-
- components/dash-table/node_modules
561-
- run:
562-
name: Run tests
563-
command: |
564-
. venv/bin/activate
565-
cd components/dash-table
566-
npm run test.unit
567-
568462
table-visual-test:
569463
working_directory: ~/dash/components/dash-table
570464
docker:
@@ -601,45 +495,6 @@ jobs:
601495
- store_artifacts:
602496
path: storybook-static
603497

604-
table-node:
605-
working_directory: ~/dash
606-
docker:
607-
- image: cimg/python:3.12.1-node
608-
environment:
609-
PYVERSION: python312
610-
PERCY_ENABLE: 0
611-
steps:
612-
- checkout:
613-
path: ~/dash
614-
- run: echo $PYVERSION > ver.txt
615-
- run: cat requirements/*.txt > requirements-all.txt
616-
- restore_cache:
617-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
618-
- restore_cache:
619-
key: dep-{{ .Branch }}-{{ checksum "components/dash-table/package-lock.json" }}-{{ checksum "components/dash-table/package.json" }}
620-
- run:
621-
name: Install package.json
622-
command: cd components/dash-table && npm ci
623-
- save_cache:
624-
key: dep-{{ .Branch }}-{{ checksum "components/dash-table/package-lock.json" }}-{{ checksum "components/dash-table/package.json" }}
625-
paths:
626-
- components/dash-table/node_modules
627-
- attach_workspace:
628-
at: ~/dash
629-
- run:
630-
name: Install requirements
631-
command: |
632-
. venv/bin/activate
633-
pip install dash-package/dash-package.tar.gz[ci,dev,testing]
634-
635-
- run:
636-
name: Run eslint
637-
command: |
638-
. venv/bin/activate
639-
cd components/dash-table
640-
npm run lint
641-
when: always
642-
643498
workflows:
644499
version: 2
645500
tests:
@@ -687,23 +542,13 @@ workflows:
687542
requires:
688543
- install-dependencies-38
689544

690-
- table-node:
691-
requires:
692-
- install-dependencies-312
693-
- table-unit-test:
694-
requires:
695-
- install-dependencies-312
696545
- table-visual-test
697-
- table-server:
698-
requires:
699-
- install-dependencies-312
700546

701547
- percy/finalize_all:
702548
requires:
703549
- test-312
704550
- dcc-312
705551
- html-312
706-
- table-server
707552
- artifacts:
708553
requires:
709554
- percy/finalize_all

0 commit comments

Comments
 (0)