Skip to content

Commit 5b12234

Browse files
committed
Merge branch 'main' into fix#829
2 parents 7c7a481 + 9ca80e1 commit 5b12234

File tree

96 files changed

+1488
-1394
lines changed

Some content is hidden

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

96 files changed

+1488
-1394
lines changed

.eslintrc.js

Lines changed: 3 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",
@@ -57,6 +58,7 @@ module.exports = {
5758
}
5859
],
5960
"prefer-arrow-callback": "error",
61+
"no-console": ["error", {"allow": ["error", "warn", "debug"]}],
6062
"no-duplicate-imports": "error",
6163
},
6264
};

.github/workflows/build.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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: |
@@ -121,7 +121,7 @@ jobs:
121121
runs-on: ubuntu-latest
122122

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

@@ -166,7 +166,7 @@ jobs:
166166
qgis
167167
168168
- name: Download extension package
169-
uses: actions/download-artifact@v5
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: |
@@ -239,7 +239,11 @@ jobs:
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: >-
243+
lite/
244+
https://www\.npmjs\.com.*
245+
^/.*
246+
https://blog\.jupyter\.org/.*
243247
244248
build-lite:
245249
name: Build JupyterLite artifacts
@@ -263,7 +267,7 @@ jobs:
263267
jupyter_server
264268
265269
- name: Download extension package
266-
uses: actions/download-artifact@v5
270+
uses: actions/download-artifact@v6
267271
with:
268272
name: extension-artifacts
269273

@@ -290,7 +294,7 @@ jobs:
290294
jupyter lite build --contents content --output-dir dist
291295
292296
- name: Upload Lite artifacts
293-
uses: actions/upload-artifact@v4
297+
uses: actions/upload-artifact@v5
294298
with:
295299
name: lite-artifacts
296300
path: ./lite/dist
@@ -318,7 +322,7 @@ jobs:
318322
jupyterlab
319323
320324
- name: Download extension package
321-
uses: actions/download-artifact@v5
325+
uses: actions/download-artifact@v6
322326
with:
323327
name: lite-artifacts
324328
path: dist
@@ -350,7 +354,7 @@ jobs:
350354
- name: Upload Playwright Test report
351355
id: upload-galata-artifact
352356
if: always()
353-
uses: actions/upload-artifact@v4
357+
uses: actions/upload-artifact@v5
354358
with:
355359
name: jupytergis-lite-playwright-tests
356360
path: |

.github/workflows/check-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 }}'

.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

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

docs/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env bash
2+
set -euo pipefail
23

34
THIS_DIR="$( cd "$(dirname "$0")"; pwd -P )"
45

56
# Build can fail if certain artifacts exist here:
6-
rm -rf "${THIS_DIR}/_build"
7+
${THIS_DIR}/clean.sh
78

89
python -m sphinx \
910
--nitpicky --show-traceback \

docs/clean.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
THIS_DIR="$( cd "$(dirname "$0")"; pwd -P )"
5+
rm -rf "${THIS_DIR}/_build"

docs/contributor_guide/development_setup.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ cd jupytergis
2424

2525
```````{tabs}
2626
``````{group-tab} Micromamba (Recommended)
27+
```{note}
28+
Micromamba is a lightweight package manager compatible with conda environments.
29+
It is recommended for setting up the JupyterGIS development environment. If you don’t have it installed, please follow the official documentation: [Micromamba Installation Guide](https://mamba.readthedocs.io/en/latest/installation/micromamba-installation.html)
30+
```
31+
2732
```bash
2833
# Create a virtual environment
2934

0 commit comments

Comments
 (0)