Skip to content

Commit 6051319

Browse files
authored
Merge pull request #2752 from BSd3v/windows-build-changes
making adjustments for building dash on a windows machine
2 parents 91b6acf + 5184121 commit 6051319

File tree

15 files changed

+3007
-270
lines changed

15 files changed

+3007
-270
lines changed

.circleci/config.yml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ orbs:
55
percy: percy/[email protected]
66
browser-tools: circleci/[email protected]
77

8+
89
jobs:
910
artifacts:
1011
docker:
@@ -107,7 +108,7 @@ jobs:
107108
- restore_cache:
108109
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
109110
- browser-tools/install-browser-tools:
110-
chrome-version: 116.0.5845.110
111+
chrome-version: 120.0.6099.71
111112
- run:
112113
name: ️️🏗️ pip dev requirements
113114
command: |
@@ -150,16 +151,26 @@ jobs:
150151
PERCY_ENABLE: 0
151152
steps:
152153
- checkout
153-
154154
- run:
155-
name: "Install Python"
156-
command: choco install -y python --version=3.12.1
157-
155+
name: pip
156+
command: |
157+
python -m venv venv && . venv/Scripts/activate
158+
pip install --no-cache-dir --upgrade -e .[ci,dev] --progress-bar off
159+
- run:
160+
command: |
161+
nvm install 18 && nvm use 18
158162
- run:
159-
name: ️️🏗️ build core
163+
name: npm prereqs
160164
command: |
161-
py -3.12 -m pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
162-
cd dash/dash-renderer && C:/Python312/Scripts/renderer.exe build && cd ../../
165+
npm ci
166+
cd dash/dash-renderer && npm i && cd ../../
167+
cd components/dash-html-components && npm i && npm run extract && cd ../../
168+
- run:
169+
name: ️️🏗️ build dash
170+
command: |
171+
. venv/Scripts/activate
172+
npm run private::build.jupyterlab && npm run private::build.renderer && python dash/development/update_components.py 'dash-html-components'
173+
no_output_timeout: 30m
163174

164175
test-312: &test
165176
working_directory: ~/dash
@@ -188,7 +199,7 @@ jobs:
188199
- restore_cache:
189200
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
190201
- browser-tools/install-browser-tools:
191-
chrome-version: 116.0.5845.110
202+
chrome-version: 120.0.6099.71
192203
install-firefox: false
193204
install-geckodriver: false
194205
- attach_workspace:
@@ -305,7 +316,7 @@ jobs:
305316
- restore_cache:
306317
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
307318
- browser-tools/install-browser-tools:
308-
chrome-version: 116.0.5845.110
319+
chrome-version: 120.0.6099.71
309320
install-firefox: false
310321
install-geckodriver: false
311322
- attach_workspace:
@@ -376,7 +387,7 @@ jobs:
376387
- restore_cache:
377388
key: html-{{ checksum "components/dash-html-components/package.json" }}-{{ checksum "components/dash-html-components/package-lock.json" }}
378389
- browser-tools/install-browser-tools:
379-
chrome-version: 116.0.5845.110
390+
chrome-version: 120.0.6099.71
380391
install-firefox: false
381392
install-geckodriver: false
382393
- attach_workspace:
@@ -450,7 +461,7 @@ jobs:
450461
- restore_cache:
451462
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
452463
- browser-tools/install-browser-tools:
453-
chrome-version: 116.0.5845.110
464+
chrome-version: 120.0.6099.71
454465
install-firefox: false
455466
install-geckodriver: false
456467
- attach_workspace:
@@ -506,7 +517,7 @@ jobs:
506517
- restore_cache:
507518
key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
508519
- browser-tools/install-browser-tools:
509-
chrome-version: 116.0.5845.110
520+
chrome-version: 120.0.6099.71
510521
install-firefox: false
511522
install-geckodriver: false
512523
- attach_workspace:
@@ -544,7 +555,7 @@ jobs:
544555
- restore_cache:
545556
key: dep-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
546557
- browser-tools/install-browser-tools:
547-
chrome-version: 116.0.5845.110
558+
chrome-version: 120.0.6099.71
548559
install-firefox: false
549560
install-geckodriver: false
550561
- run:

@plotly/dash-jupyterlab/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"build:pack": "jlpm run prepare && jlpm pack --filename ../../dash/labextension/dist/dash-jupyterlab.tgz && jlpm run build:copy",
2929
"build:copy": "cp package.json ../../dash/labextension/dist/package.json",
3030
"clean": "rimraf lib",
31-
"prepare": "mkdir -p ../../dash/labextension/dist && jlpm run clean && jlpm run build",
31+
"prepare": "mkdirp ../../dash/labextension/dist && jlpm run clean && jlpm run build",
3232
"prettier": "prettier --write '{!(package),src/**,!(lib)/**}{.js,.jsx,.ts,.tsx,.css,.json,.md}'",
3333
"watch": "tsc -w"
3434
},
@@ -40,7 +40,8 @@
4040
"devDependencies": {
4141
"prettier": "2.0.5",
4242
"rimraf": "3.0.2",
43-
"typescript": "3.9.3"
43+
"typescript": "3.9.3",
44+
"mkdirp": "^0.5.1"
4445
},
4546
"jupyterlab": {
4647
"extension": true

0 commit comments

Comments
 (0)