Skip to content

Commit 9ece14d

Browse files
committed
CI tweakz
1 parent d01b843 commit 9ece14d

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

.circleci/config.yml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
161161
PYVERSION: python39
162162
REDIS_URL: redis://localhost:6379
163-
- image: cimg/redis
163+
- image: cimg/redis:6.2.6
164164
auth:
165165
username: dashautomation
166166
password: $DASH_PAT_DOCKERHUB
@@ -172,7 +172,9 @@ jobs:
172172
- run: cat requires-*.txt > requires-all.txt
173173
- restore_cache:
174174
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
175-
- browser-tools/install-browser-tools
175+
- browser-tools/install-browser-tools:
176+
install-firefox: false
177+
install-geckodriver: false
176178
- attach_workspace:
177179
at: ~/dash
178180
- run:
@@ -206,7 +208,7 @@ jobs:
206208
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
207209
PYVERSION: python36
208210
REDIS_URL: redis://localhost:6379
209-
- image: cimg/redis
211+
- image: cimg/redis:6.2.6
210212
auth:
211213
username: dashautomation
212214
password: $DASH_PAT_DOCKERHUB
@@ -267,7 +269,9 @@ jobs:
267269
- run: cat requires-*.txt > requires-all.txt
268270
- restore_cache:
269271
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
270-
- browser-tools/install-browser-tools
272+
- browser-tools/install-browser-tools:
273+
install-firefox: false
274+
install-geckodriver: false
271275
- attach_workspace:
272276
at: ~/dash
273277
- run:
@@ -282,7 +286,7 @@ jobs:
282286
. venv/bin/activate && rm -rf components/dash-core-components/dash_core_components
283287
cd components/dash-core-components
284288
TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings)
285-
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES}
289+
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components." ${TESTFILES}
286290
- store_artifacts:
287291
path: ~/dash/components/dash-core-components/test-reports
288292
- store_test_results:
@@ -322,7 +326,9 @@ jobs:
322326
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
323327
- restore_cache:
324328
key: html-{{ checksum "components/dash-html-components/package.json" }}-{{ checksum "components/dash-html-components/package-lock.json" }}
325-
- browser-tools/install-browser-tools
329+
- browser-tools/install-browser-tools:
330+
install-firefox: false
331+
install-geckodriver: false
326332
- attach_workspace:
327333
at: ~/dash
328334
- run:
@@ -333,6 +339,7 @@ jobs:
333339
pip list | grep dash
334340
cd components/dash-html-components
335341
npm ci
342+
npm run prebuild
336343
- save_cache:
337344
key: html-{{ checksum "components/dash-html-components/package.json" }}-{{ checksum "components/dash-html-components/package-lock.json" }}
338345
paths:
@@ -379,7 +386,9 @@ jobs:
379386
- run: cat requires-*.txt > requires-all.txt
380387
- restore_cache:
381388
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
382-
- browser-tools/install-browser-tools
389+
- browser-tools/install-browser-tools:
390+
install-firefox: false
391+
install-geckodriver: false
383392
- attach_workspace:
384393
at: ~/dash
385394
- run:
@@ -398,7 +407,7 @@ jobs:
398407
. venv/bin/activate
399408
cd components/dash-table
400409
TESTFILES=$(circleci tests glob "tests/selenium/**/test_*.py" | circleci tests split --split-by=timings)
401-
pytest --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES}
410+
pytest --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-table." ${TESTFILES}
402411
- store_artifacts:
403412
path: ~/dash/components/dash-table/test-reports
404413
- store_test_results:
@@ -422,7 +431,9 @@ jobs:
422431
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
423432
- restore_cache:
424433
key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
425-
- browser-tools/install-browser-tools
434+
- browser-tools/install-browser-tools:
435+
install-firefox: false
436+
install-geckodriver: false
426437
- attach_workspace:
427438
at: ~/dash
428439
- run:
@@ -456,7 +467,9 @@ jobs:
456467
path: ~/dash
457468
- restore_cache:
458469
key: dep-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
459-
- browser-tools/install-browser-tools
470+
- browser-tools/install-browser-tools:
471+
install-firefox: false
472+
install-geckodriver: false
460473
- run:
461474
name: Install package.json
462475
command: npm ci

requires-ci.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ mock==4.0.3
1111
numpy
1212
orjson==3.5.4;python_version<"3.7"
1313
orjson==3.6.3;python_version>="3.7"
14+
openpyxl;python_version>="3.8"
1415
pandas>=1.4.0;python_version>="3.8"
1516
pandas==1.1.5;python_version<"3.8"
1617
preconditions

0 commit comments

Comments
 (0)