Skip to content

Commit 657aba6

Browse files
committed
Resolving Conflicts
2 parents 1747e6e + 88ffc5b commit 657aba6

File tree

124 files changed

+1559
-801
lines changed

Some content is hidden

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

124 files changed

+1559
-801
lines changed

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module.exports = {
1111
},
1212
plugins: ["@typescript-eslint", "import"],
1313
rules: {
14+
"@typescript-eslint/ban-ts-comment": "warn",
1415
"@typescript-eslint/naming-convention": [
1516
"error",
1617
{
@@ -31,7 +32,7 @@ module.exports = {
3132
],
3233
"@typescript-eslint/no-explicit-any": "off",
3334
"@typescript-eslint/no-namespace": "off",
34-
"@typescript-eslint/ban-ts-comment": "warn",
35+
"@typescript-eslint/no-unnecessary-type-assertion": "error",
3536
"@typescript-eslint/no-use-before-define": "off",
3637
"@typescript-eslint/quotes": [
3738
"error",

.github/workflows/build.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
- name: Install Conda environment with Micromamba
2222
uses: mamba-org/setup-micromamba@v2
@@ -69,7 +69,7 @@ jobs:
6969
yarn build:packages
7070
7171
- name: Upload extension packages
72-
uses: actions/upload-artifact@v4
72+
uses: actions/upload-artifact@v5
7373
with:
7474
name: ${{ matrix.python-version == '3.12' && 'extension-artifacts' || format('extension-artifacts-{0}', matrix.python-version) }}
7575
path: |
@@ -98,7 +98,7 @@ jobs:
9898
qgis
9999
100100
- name: Checkout
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v5
102102

103103
- name: Install
104104
shell: bash -l {0}
@@ -121,7 +121,7 @@ jobs:
121121
runs-on: ubuntu-latest
122122

123123
steps:
124-
- uses: actions/download-artifact@v4
124+
- uses: actions/download-artifact@v6
125125
with:
126126
name: extension-artifacts
127127

@@ -152,7 +152,7 @@ jobs:
152152

153153
steps:
154154
- name: Checkout
155-
uses: actions/checkout@v4
155+
uses: actions/checkout@v5
156156

157157
- name: Install Conda environment with Micromamba
158158
uses: mamba-org/setup-micromamba@v2
@@ -166,7 +166,7 @@ jobs:
166166
qgis
167167
168168
- name: Download extension package
169-
uses: actions/download-artifact@v4
169+
uses: actions/download-artifact@v6
170170
with:
171171
name: extension-artifacts
172172

@@ -192,7 +192,7 @@ jobs:
192192
- name: Upload Playwright Test report
193193
id: upload-galata-artifact
194194
if: always()
195-
uses: actions/upload-artifact@v4
195+
uses: actions/upload-artifact@v5
196196
with:
197197
name: jupytergis-playwright-tests
198198
path: |
@@ -212,7 +212,7 @@ jobs:
212212

213213
steps:
214214
- name: Checkout
215-
uses: actions/checkout@v4
215+
uses: actions/checkout@v5
216216

217217
- name: Install Conda environment with Micromamba
218218
uses: mamba-org/setup-micromamba@v2
@@ -235,11 +235,11 @@ jobs:
235235
runs-on: ubuntu-latest
236236
timeout-minutes: 15
237237
steps:
238-
- uses: actions/checkout@v4
238+
- uses: actions/checkout@v5
239239
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
240240
- uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
241241
with:
242-
ignore_links: 'lite/'
242+
ignore_links: 'lite/ https://www.npmjs.com.* ^/.*'
243243

244244
build-lite:
245245
name: Build JupyterLite artifacts
@@ -248,7 +248,7 @@ jobs:
248248

249249
steps:
250250
- name: Checkout
251-
uses: actions/checkout@v4
251+
uses: actions/checkout@v5
252252

253253
- name: Install Conda environment with Micromamba
254254
uses: mamba-org/setup-micromamba@v2
@@ -263,7 +263,7 @@ jobs:
263263
jupyter_server
264264
265265
- name: Download extension package
266-
uses: actions/download-artifact@v4
266+
uses: actions/download-artifact@v6
267267
with:
268268
name: extension-artifacts
269269

@@ -285,11 +285,12 @@ jobs:
285285
working-directory: lite
286286
run: |
287287
set -eux
288-
mkdir -p content && cp ../examples/*.jGIS ../examples/*.qgz ../examples/*.geojson ../examples/*.tif ../examples/*.zip ../examples/*.ipynb ../examples/*.gif ./content
288+
cp --recursive --dereference ../ui-tests/content ./content
289+
find ./content -type d -name ".ipynb_checkpoints" -exec rm -rf {} +
289290
jupyter lite build --contents content --output-dir dist
290291
291292
- name: Upload Lite artifacts
292-
uses: actions/upload-artifact@v4
293+
uses: actions/upload-artifact@v5
293294
with:
294295
name: lite-artifacts
295296
path: ./lite/dist
@@ -305,7 +306,7 @@ jobs:
305306

306307
steps:
307308
- name: Checkout
308-
uses: actions/checkout@v4
309+
uses: actions/checkout@v5
309310

310311
- name: Install Conda environment with Micromamba
311312
uses: mamba-org/setup-micromamba@v2
@@ -317,7 +318,7 @@ jobs:
317318
jupyterlab
318319
319320
- name: Download extension package
320-
uses: actions/download-artifact@v4
321+
uses: actions/download-artifact@v6
321322
with:
322323
name: lite-artifacts
323324
path: dist
@@ -349,7 +350,7 @@ jobs:
349350
- name: Upload Playwright Test report
350351
id: upload-galata-artifact
351352
if: always()
352-
uses: actions/upload-artifact@v4
353+
uses: actions/upload-artifact@v5
353354
with:
354355
name: jupytergis-lite-playwright-tests
355356
path: |

.github/workflows/check-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: Base Setup
2121
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
@@ -27,7 +27,7 @@ jobs:
2727
version_spec: next
2828

2929
- name: Upload Distributions
30-
uses: actions/upload-artifact@v4
30+
uses: actions/upload-artifact@v5
3131
with:
3232
name: jupytergis-releaser-dist-${{ github.run_number }}
3333
path: .jupyter_releaser_checkout/dist
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'PR Triage Bot'
2+
3+
on:
4+
schedule:
5+
- cron: '0 * * * *'
6+
workflow_dispatch:
7+
8+
jobs:
9+
pr-triage:
10+
runs-on: 'ubuntu-latest'
11+
steps:
12+
- name: 'Run PR Triage Bot'
13+
uses: 'yuvipanda/pr-triage-board-bot@20fe5e15dc83ecff7eddffd9850f1d25518615c9'
14+
with:
15+
organization: 'geojupyter'
16+
repositories: 'jupytergis'
17+
project-number: '3'
18+
gh-app-id: '1943749'
19+
gh-app-installation-id: '85628873'
20+
gh-app-private-key: '${{ secrets.GH_APP_PRIVATE_KEY }}'

.github/workflows/update_galata_references.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3131

3232
- name: Checkout
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }}
3636

.github/workflows/update_lite_galata_references.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3131

3232
- name: Checkout
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }}
3636

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exclude: '.*\.jgis$'
88
repos:
99
# Autoformat and linting, misc. details
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
11-
rev: v5.0.0
11+
rev: v6.0.0
1212
hooks:
1313
- id: forbid-new-submodules
1414
- id: end-of-file-fixer
@@ -28,7 +28,7 @@ repos:
2828

2929
# Autoformat: Python code
3030
- repo: https://github.com/astral-sh/ruff-pre-commit
31-
rev: v0.12.2
31+
rev: v0.13.3
3232
hooks:
3333
- id: ruff
3434
args: ['--fix']

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
nodeLinker: node-modules
22
enableImmutableInstalls: false
3+
enableScripts: false

CHANGELOG.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,35 @@
22

33
<!-- <START NEW CHANGELOG ENTRY> -->
44

5+
## 0.9.2
6+
7+
([Full Changelog](https://github.com/geojupyter/jupytergis/compare/@jupytergis/[email protected]))
8+
9+
### Enhancements made
10+
11+
- Add cmocean colormaps, fix bug when switching render type [#886](https://github.com/geojupyter/jupytergis/pull/886) ([@nakul-py](https://github.com/nakul-py))
12+
13+
### Bugs fixed
14+
15+
- Notebook Renderer: make `formSchemaRegistry` a required property [#918](https://github.com/geojupyter/jupytergis/pull/918) ([@arjxn-py](https://github.com/arjxn-py))
16+
17+
### Maintenance and upkeep improvements
18+
19+
- Bump the gha-dependencies group with 2 updates [#914](https://github.com/geojupyter/jupytergis/pull/914) ([@dependabot](https://github.com/dependabot))
20+
21+
### Documentation improvements
22+
23+
- JupyterLite deployment: Disable caching content [#913](https://github.com/geojupyter/jupytergis/pull/913) ([@martinRenou](https://github.com/martinRenou))
24+
- Updated and organized ipynb examples directory for clarity [#872](https://github.com/geojupyter/jupytergis/pull/872) ([@mapninja](https://github.com/mapninja))
25+
26+
### Contributors to this release
27+
28+
([GitHub contributors page for this release](https://github.com/geojupyter/jupytergis/graphs/contributors?from=2025-08-27&to=2025-09-05&type=c))
29+
30+
[@arjxn-py](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Aarjxn-py+updated%3A2025-08-27..2025-09-05&type=Issues) | [@dependabot](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Adependabot+updated%3A2025-08-27..2025-09-05&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Agithub-actions+updated%3A2025-08-27..2025-09-05&type=Issues) | [@mapninja](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Amapninja+updated%3A2025-08-27..2025-09-05&type=Issues) | [@martinRenou](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3AmartinRenou+updated%3A2025-08-27..2025-09-05&type=Issues) | [@mfisher87](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Amfisher87+updated%3A2025-08-27..2025-09-05&type=Issues) | [@nakul-py](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Anakul-py+updated%3A2025-08-27..2025-09-05&type=Issues)
31+
32+
<!-- <END NEW CHANGELOG ENTRY> -->
33+
534
## 0.9.1
635

736
([Full Changelog](https://github.com/geojupyter/jupytergis/compare/@jupytergis/[email protected]))
@@ -20,8 +49,6 @@
2049

2150
[@arjxn-py](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Aarjxn-py+updated%3A2025-08-27..2025-08-27&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3Agithub-actions+updated%3A2025-08-27..2025-08-27&type=Issues) | [@martinRenou](https://github.com/search?q=repo%3Ageojupyter%2Fjupytergis+involves%3AmartinRenou+updated%3A2025-08-27..2025-08-27&type=Issues)
2251

23-
<!-- <END NEW CHANGELOG ENTRY> -->
24-
2552
## 0.9.0
2653

2754
([Full Changelog](https://github.com/geojupyter/jupytergis/compare/@jupytergis/[email protected]))

docs/build-on-change.sh

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
# NOTE: Requires `inotify-tools`. e.g. `apt install inotify-tools`.
3+
# TODO: MacOS support?
4+
set -euo pipefail
5+
6+
THIS_DIR="$( cd "$(dirname "$0")"; pwd -P )"
7+
cd "${THIS_DIR}"
8+
HTML_PATH="./_build/html/index.html"
9+
10+
${THIS_DIR}/clean.sh
11+
12+
set +e
13+
${THIS_DIR}/build.sh
14+
xdg-open "${HTML_PATH}"
15+
set -e
16+
17+
while inotifywait -e delete -e create -e close_write -r ${THIS_DIR}; do
18+
${THIS_DIR}/clean.sh
19+
20+
set +e
21+
${THIS_DIR}/build.sh
22+
set -e
23+
done

0 commit comments

Comments
 (0)