Skip to content

Commit a36fe8d

Browse files
authored
Merge branch 'main' into hooks
2 parents 0d69ede + 88ffc5b commit a36fe8d

File tree

66 files changed

+615
-314
lines changed

Some content is hidden

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

66 files changed

+615
-314
lines changed

.github/workflows/build.yml

Lines changed: 9 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,7 @@ 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: 'lite/ https://www.npmjs.com.* ^/.*'
243243

244244
build-lite:
245245
name: Build JupyterLite artifacts
@@ -263,7 +263,7 @@ jobs:
263263
jupyter_server
264264
265265
- name: Download extension package
266-
uses: actions/download-artifact@v5
266+
uses: actions/download-artifact@v6
267267
with:
268268
name: extension-artifacts
269269

@@ -290,7 +290,7 @@ jobs:
290290
jupyter lite build --contents content --output-dir dist
291291
292292
- name: Upload Lite artifacts
293-
uses: actions/upload-artifact@v4
293+
uses: actions/upload-artifact@v5
294294
with:
295295
name: lite-artifacts
296296
path: ./lite/dist
@@ -318,7 +318,7 @@ jobs:
318318
jupyterlab
319319
320320
- name: Download extension package
321-
uses: actions/download-artifact@v5
321+
uses: actions/download-artifact@v6
322322
with:
323323
name: lite-artifacts
324324
path: dist
@@ -350,7 +350,7 @@ jobs:
350350
- name: Upload Playwright Test report
351351
id: upload-galata-artifact
352352
if: always()
353-
uses: actions/upload-artifact@v4
353+
uses: actions/upload-artifact@v5
354354
with:
355355
name: jupytergis-lite-playwright-tests
356356
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

.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']

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

docs/contributor_guide/how-tos/build-docs-locally.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ below, but they will not be as fast.
77

88
## 0. Build JupyterGIS JavaScript packages
99

10-
Follow the [development environment setup instructions](../development_setup.md) through running `jlpm run build` from the **root of the repo**.
10+
Follow the [development environment setup instructions](/contributor_guide/development_setup.md) through running `jlpm run build` from the **root of the repo**.
1111

1212
:::{important}
1313
Navigate to the `docs/` directory before starting any of the following steps!

docs/contributor_guide/how-tos/code_quality.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Check code quality
22

33
```{seealso}
4-
Complete [dev install](../development_setup) instructions before continuing.
4+
Complete [dev install](/contributor_guide/development_setup) instructions before continuing.
55
```
66

77
We have several tools configured for checking code quality:

docs/contributor_guide/index.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
We're thrilled you're ready to contribute to JupyterGIS!
44

5+
This documentation will help you get started with the technical aspects of contribution
6+
to this project.
7+
To learn more about the social aspects (meeting notes, policies, roles), please view the
8+
[GeoJupyter team compass](https://compass.geojupyter.org/).
9+
510
To chat with other contributors, please
611
[join us on Zulip](https://jupyter.zulipchat.com/#narrow/channel/471314-geojupyter)!
712

0 commit comments

Comments
 (0)