Skip to content

Commit 3d221fe

Browse files
committed
Flatten the examples folder structure
Fixes #114
1 parent 9d0a3c1 commit 3d221fe

File tree

195 files changed

+93
-82
lines changed

Some content is hidden

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

195 files changed

+93
-82
lines changed

.github/workflows/main.yml

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
example:
16-
- advanced/kernel-messaging
17-
- advanced/kernel-output
18-
- basics/datagrid
19-
- basics/hello-world
20-
- basics/signals
16+
- kernel-messaging
17+
- kernel-output
18+
- datagrid
19+
- hello-world
20+
- signals
2121
- command-palette
2222
- commands
2323
- context-menu
2424
- launcher
25-
- log-console/custom-log-console
26-
- log-console/log-messages
25+
- custom-log-console
26+
- log-messages
2727
- main-menu
28-
- react/react-widget
28+
- react-widget
2929
- settings
3030
- state
31-
- widget-tracker/widgets
31+
- widgets
3232
os: [ubuntu-latest, macos-latest, windows-latest]
3333
steps:
3434
- name: Checkout
@@ -53,10 +53,10 @@ jobs:
5353
- name: Check config files
5454
if: steps.filter.outputs.extension == 'true'
5555
run: |
56-
diff basics/hello-world/tsconfig.json ${EXAMPLE_FOLDER}/tsconfig.json
57-
diff basics/hello-world/.eslintignore ${EXAMPLE_FOLDER}/.eslintignore
58-
diff basics/hello-world/.eslintrc.js ${EXAMPLE_FOLDER}/.eslintrc.js
59-
diff basics/hello-world/.gitignore ${EXAMPLE_FOLDER}/.gitignore
56+
diff hello-world/tsconfig.json ${EXAMPLE_FOLDER}/tsconfig.json
57+
diff hello-world/.eslintignore ${EXAMPLE_FOLDER}/.eslintignore
58+
diff hello-world/.eslintrc.js ${EXAMPLE_FOLDER}/.eslintrc.js
59+
diff hello-world/.gitignore ${EXAMPLE_FOLDER}/.gitignore
6060
env:
6161
EXAMPLE_FOLDER: ${{ matrix.example }}
6262
shell: bash
@@ -132,15 +132,15 @@ jobs:
132132
with:
133133
filters: |
134134
extension:
135-
- 'advanced/server-extension/**'
135+
- 'server-extension/**'
136136
- name: Cache lerna
137137
if: steps.filter.outputs.extension == 'true'
138138
uses: actions/cache@v2
139139
with:
140140
path: |
141141
node_modules
142142
*/*/node_modules
143-
key: ${{ runner.os }}-lerna-${{ hashFiles('advanced/server-extension/package.json') }}
143+
key: ${{ runner.os }}-lerna-${{ hashFiles('server-extension/package.json') }}
144144
restore-keys: |
145145
${{ runner.os }}-lerna-
146146
- name: Install node
@@ -151,9 +151,9 @@ jobs:
151151
- name: Check config files
152152
if: steps.filter.outputs.extension == 'true'
153153
run: |
154-
diff basics/hello-world/tsconfig.json advanced/server-extension/tsconfig.json
155-
diff basics/hello-world/.eslintignore advanced/server-extension/.eslintignore
156-
diff basics/hello-world/.eslintrc.js advanced/server-extension/.eslintrc.js
154+
diff hello-world/tsconfig.json server-extension/tsconfig.json
155+
diff hello-world/.eslintignore server-extension/.eslintignore
156+
diff hello-world/.eslintrc.js server-extension/.eslintrc.js
157157
shell: bash
158158
- name: Install Python
159159
if: steps.filter.outputs.extension == 'true'
@@ -182,18 +182,18 @@ jobs:
182182
- name: Install the NPM dependencies
183183
if: steps.filter.outputs.extension == 'true'
184184
run: |
185-
cd advanced/server-extension
185+
cd server-extension
186186
jlpm
187187
- name: Lint the files
188188
if: steps.filter.outputs.extension == 'true'
189189
run: |
190-
cd advanced/server-extension
190+
cd server-extension
191191
jlpm run eslint:check
192192
- name: Build extension as user
193193
if: steps.filter.outputs.extension == 'true'
194194
# Force the usage of the source distribution (good practice)
195195
run: |
196-
cd advanced/server-extension
196+
cd server-extension
197197
python setup.py sdist
198198
pip install ./dist/jlab_ext_example* --pre --find-links=dist --no-cache-dir
199199
python -m jupyterlab.browser_check
@@ -212,7 +212,7 @@ jobs:
212212
- name: Build extension as dev
213213
if: steps.filter.outputs.extension == 'true'
214214
run: |
215-
cd advanced/server-extension
215+
cd server-extension
216216
pip install -e .
217217
- name: Check extension as dev
218218
if: steps.filter.outputs.extension == 'true' && ( startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') )
@@ -266,7 +266,8 @@ jobs:
266266
run: jlpm
267267
- name: Build all the extensions
268268
run: |
269-
pytest --check-links
270269
jlpm build-ext
271270
jlpm lint:check
272271
jlpm install-ext
272+
# Check links as last step as new tutorial may set links not yet valid (like file not yet in master)
273+
pytest --check-links

README.md

Lines changed: 33 additions & 33 deletions

advanced/README.md

Whitespace-only changes.

basics/README.md

Whitespace-only changes.
File renamed without changes.

log-console/custom-log-console/README.md renamed to custom-log-console/README.md

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)