Skip to content

Commit d01b843

Browse files
committed
more CI cleanup
1 parent 59540b4 commit d01b843

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed

.circleci/config.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ jobs:
161161
PYVERSION: python39
162162
REDIS_URL: redis://localhost:6379
163163
- image: cimg/redis
164+
auth:
165+
username: dashautomation
166+
password: $DASH_PAT_DOCKERHUB
164167
parallelism: 3
165168
steps:
166169
- checkout:
@@ -204,6 +207,9 @@ jobs:
204207
PYVERSION: python36
205208
REDIS_URL: redis://localhost:6379
206209
- image: cimg/redis
210+
auth:
211+
username: dashautomation
212+
password: $DASH_PAT_DOCKERHUB
207213

208214
dcc-lint-unit-39: &dcc-lint-unit
209215
working_directory: ~/dash
@@ -314,15 +320,23 @@ jobs:
314320
- run: cat requires-*.txt > requires-all.txt
315321
- restore_cache:
316322
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
323+
- restore_cache:
324+
key: html-{{ checksum "components/dash-html-components/package.json" }}-{{ checksum "components/dash-html-components/package-lock.json" }}
317325
- browser-tools/install-browser-tools
318326
- attach_workspace:
319327
at: ~/dash
320328
- run:
321-
name: ️️🏗️ Install package
329+
name: ️️🏗️ Install package and html
322330
command: |
323331
. venv/bin/activate
324332
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
325333
pip list | grep dash
334+
cd components/dash-html-components
335+
npm ci
336+
- save_cache:
337+
key: html-{{ checksum "components/dash-html-components/package.json" }}-{{ checksum "components/dash-html-components/package-lock.json" }}
338+
paths:
339+
- components/dash-html-components/node_modules
326340
- run:
327341
name: 🧪 Run tests
328342
command: |
@@ -372,7 +386,6 @@ jobs:
372386
name: ️️🏗️ Install package
373387
command: |
374388
. venv/bin/activate
375-
npm install --production
376389
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
377390
pip list | grep dash
378391
- run:
@@ -394,7 +407,7 @@ jobs:
394407
path: /tmp/dash_artifacts
395408

396409
table-unit-test:
397-
working_directory: ~/dash/components/dash-table
410+
working_directory: ~/dash
398411
docker:
399412
- image: cimg/python:3.9.9-browsers
400413
environment:
@@ -407,16 +420,23 @@ jobs:
407420
- run: cat requires-*.txt > requires-all.txt
408421
- restore_cache:
409422
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
423+
- restore_cache:
424+
key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
410425
- browser-tools/install-browser-tools
411426
- attach_workspace:
412427
at: ~/dash
413428
- run:
414-
name: ️️🏗️ Install package
429+
name: ️️🏗️ Install package and table deps
415430
command: |
416431
. venv/bin/activate
417-
npm install --production
418432
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
419433
pip list | grep dash
434+
cd components/dash-table
435+
npm ci
436+
- save_cache:
437+
key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
438+
paths:
439+
- components/dash-table/node_modules
420440
- run:
421441
name: Run tests
422442
command: |

requires-ci.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ 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-
pandas
14+
pandas>=1.4.0;python_version>="3.8"
15+
pandas==1.1.5;python_version<"3.8"
1516
preconditions
1617
pyarrow<3;python_version<"3.7"
1718
pyarrow;python_version>="3.7"
1819
pylint==2.10.2
1920
pytest-mock==3.2.0
2021
pytest-sugar==0.9.4
21-
xlrd<2
22+
xlrd>=2.0.1;python_version>="3.8"
23+
xlrd<2;python_version<"3.8"

0 commit comments

Comments
 (0)