Skip to content

Commit 66c974c

Browse files
authored
Merge branch 'main' into bc/bump-pydantic
2 parents 656e696 + 0850aff commit 66c974c

Some content is hidden

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

61 files changed

+2816
-1707
lines changed

.docker/server_dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# syntax=docker/dockerfile:1
1+
ARG UV_VERSION="0.8.4"
2+
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_image
3+
24
FROM python:3.10 AS api
35
SHELL ["/bin/bash", "--login", "-c"]
46

@@ -12,7 +14,7 @@ RUN apt update && apt install -y gnupg curl tree mdbtools && apt clean
1214
WORKDIR /opt
1315
RUN wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.0.deb && apt install ./mongodb-database-tools-*-100.9.0.deb
1416

15-
COPY --from=ghcr.io/astral-sh/uv:0.6.4 /uv /usr/local/bin/uv
17+
COPY --from=uv_image /uv /usr/local/bin/uv
1618
ENV UV_LINK_MODE=copy \
1719
UV_COMPILE_BYTECODE=1 \
1820
UV_PYTHON_DOWNLOADS=never \

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: CI tests
22
on:
33
pull_request:
4-
types: [ready_for_review, opened, synchronize, reopened]
54

65
push:
76
branches:
87
- main
98

109
env:
1110
FORCE_COLOR: true
11+
UV_VERSION: "0.8.4"
1212

1313
concurrency:
1414
group: ${{ github.head_ref || github.run_id }}
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up uv
3131
uses: astral-sh/setup-uv@v6
3232
with:
33-
version: "0.6.4"
33+
version: ${{ env.UV_VERSION }}
3434
enable-cache: true
3535

3636
- name: Install dependencies
@@ -78,7 +78,7 @@ jobs:
7878
- name: Set up uv
7979
uses: astral-sh/setup-uv@v6
8080
with:
81-
version: "0.6.4"
81+
version: ${{ env.UV_VERSION }}
8282
working-directory: "./pydatalab"
8383
enable-cache: true
8484

@@ -129,7 +129,7 @@ jobs:
129129
fail-fast: false
130130
max-parallel: 3
131131
matrix:
132-
browser-backend: ["electron", "chrome", "firefox"]
132+
browser-backend: ["electron", "chrome"] # , "firefox"] # Temporarily disable Firefox until migration to Cypress v14 (https://github.com/datalab-org/datalab/issues/1289)
133133

134134
steps:
135135
- uses: actions/checkout@v4

.github/workflows/dependable-bot.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ permissions:
88
contents: write
99
pull-requests: write
1010

11+
env:
12+
UV_VERSION: "0.8.4"
13+
1114
jobs:
1215
uv-update-pins:
1316
name: Update `uv.lock` pins
@@ -28,7 +31,7 @@ jobs:
2831
- name: Set up uv
2932
uses: astral-sh/setup-uv@v6
3033
with:
31-
version: "0.6.4"
34+
version: ${{ env.UV_VERSION }}
3235
working-directory: "./pydatalab"
3336
enable-cache: true
3437

.github/workflows/license-check.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
workflow_dispatch:
44
workflow_call:
55

6+
env:
7+
UV_VERSION: "0.8.4"
8+
69
jobs:
710
licensing-checks:
811
name: "Check dependency licensing"
@@ -21,12 +24,12 @@ jobs:
2124
with:
2225
python-version: "3.11"
2326

24-
- name: Set up uv
25-
uses: astral-sh/setup-uv@v6
26-
with:
27-
version: "0.6.4"
28-
working-directory: "./pydatalab"
29-
enable-cache: true
27+
- name: Set up uv
28+
uses: astral-sh/setup-uv@v6
29+
with:
30+
version: ${{ env.UV_VERSION }}
31+
working-directory: "./pydatalab"
32+
enable-cache: true
3033

3134
- name: Run liccheck
3235
working-directory: ./pydatalab

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repos:
2929
- id: mixed-line-ending
3030

3131
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: v0.7.2
32+
rev: v0.12.7
3333
hooks:
3434
- id: ruff
3535
args: [--fix]
@@ -56,13 +56,13 @@ repos:
5656
args: [--fix]
5757

5858
- repo: https://github.com/asottile/pyupgrade
59-
rev: v3.19.0
59+
rev: v3.20.0
6060
hooks:
6161
- id: pyupgrade
6262
args: [--py310-plus]
6363

6464
- repo: https://github.com/pre-commit/mirrors-mypy
65-
rev: v1.13.0
65+
rev: v1.17.1
6666
hooks:
6767
- id: mypy
6868
additional_dependencies:

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ build:
1212
- asdf global uv latest
1313
- cd pydatalab && uv sync --all-extras --dev
1414
- cd pydatalab && uv pip install .
15-
- cd pydatalab && .venv/bin/mkdocs build --site-dir $READTHEDOCS_OUTPUT/html
15+
- cd pydatalab && .venv/bin/mkdocs build --site-dir $READTHEDOCS_OUTPUT/html --strict

CHANGELOG.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Changelog
22

3-
## v0.6.0 (June 2025)
3+
## v0.6.0 (August 2025)
44

5-
This release includes significant new functionality and UI redesign, as well as
6-
several bug and quality-of-life fixes, performance improvements and
7-
backwards-compatible API enhancements.
5+
This release includes significant new functionality and UI redesign, a
6+
fledgling plugin ecosystem, as well as several bug and quality-of-life
7+
fixes, performance improvements and backwards-compatible API enhancements.
88

99
> [!WARNING]
1010
> This release also bumps the supported MongoDB version all the way from v3 to v8. Whilst older MongoDB versions should still continue to work, version 8 will now be tested and used in the docker builds, so we recommend you upgrade. For existing databases this requires you to first dump the database using `mongodump` with the old MongoDB version, then upgrade to the new version and restore the database with `mongorestore`. If you unsure about this process then please ask us for help!
@@ -23,26 +23,30 @@ backwards-compatible API enhancements.
2323
[`datalab-app-plugin-insitu`](https://github.com/datalab-org/datalab-app-plugin-insitu)),
2424
as well as new file formats supported in the XRD (Rigaku's .rasx, variants of .xy), NMR (JCAMP-DX) blocks
2525
and media block (PDF documents).
26+
- A fledgling plugin ecosystem with ways to easily add new blocks to a specific
27+
*datalab* instance ([docs](https://docs.datalab-org.io/en/v0.6.0/plugins/)), with [`datalab-server`](https://pypi.org/project/datalab-server) PyPI package for easier dependency management.
2628
- Improved item search throughout the API, removing the need to search on
27-
whitespace or puncutation delimited words (e.g., ID matches will now begin after
29+
whitespace or punctuation delimited words (e.g., ID matches will now begin after
2830
just 3 characters, rather than needing to type a full ID).
31+
- More powerful UI block interactions via "events" that can be written purely Python ([docs](https://docs.datalab-org.io/en/v0.6.0/blocks/)).
2932

33+
**Full Changelog**: https://github.com/datalab-org/datalab/compare/v0.5.2...v0.6.0
3034

3135
## v0.5.2 (March 2025)
3236

3337
This patch release makes several visual/interactivity improvements around
3438
loading states in the UI, and adds two new blocks: FTIR and a tabular data
3539
block for plotting data from within generic CSV/Excel files.
3640

37-
## What's Changed
41+
### What's Changed
3842
* Fix docs link in mkdocs by @ml-evs in https://github.com/datalab-org/datalab/pull/1044
3943
* Improve loading state for data-intensive blocks by @BenjaminCharmes in https://github.com/datalab-org/datalab/pull/1049
4044
* Add support for reading excel-like spreadsheets in tabular data block by @ml-evs in https://github.com/datalab-org/datalab/pull/1052
4145
* Add Login Splash Screen by @BenjaminCharmes in https://github.com/datalab-org/datalab/pull/907
4246
* Added FTIR block and associated tests by @be-smith in https://github.com/datalab-org/datalab/pull/1061
4347
* Update CITATION.cff by @ml-evs in https://github.com/datalab-org/datalab/pull/1069
4448

45-
## New Contributors
49+
### New Contributors
4650
* @be-smith made their first contribution in https://github.com/datalab-org/datalab/pull/1061
4751

4852
**Full Changelog**: https://github.com/datalab-org/datalab/compare/v0.5.1...v0.5.2
@@ -51,7 +55,7 @@ block for plotting data from within generic CSV/Excel files.
5155

5256
This patch release simply pins the `uv` version used in builds to avoid future breakages.
5357

54-
## What's Changed
58+
### What's Changed
5559

5660
* Bump the github-actions group across 1 directory with 2 updates by @dependabot in https://github.com/datalab-org/datalab/pull/1031
5761
* Update uv to 0.5.x now that dynamic versioning is supported by @ml-evs in https://github.com/datalab-org/datalab/pull/1032
@@ -68,11 +72,11 @@ The Ansible playbooks at [datalab-ansible-terraform](https://github.com/datalab-
6872

6973
Many thanks to all contributors: developers, user feedback and deployment managers!
7074

71-
## Breaking changes
75+
### Breaking changes
7276

73-
* The Python server has been entirely repackaged with `uv` for much more streamlined dependency management (especially for external plugins). If you are using the docker deployments, then nothing should change for you, but developers may need to adjust their development setups following the instructions at [INSTALL.md](./INSTALL.md)
77+
* The Python server has been entirely repackaged with `uv` for much more streamlined dependency management (especially for external plugins). If you are using the docker deployments, then nothing should change for you, but developers may need to adjust their development setups following the [installation instructions](./INSTALL.md).
7478

75-
## Highlights
79+
### Highlights
7680

7781
* The table component used to display all items has been entirely rewritten, and is now more visually responsive and can accommodate custom schemas/components.
7882
* QR code generation and scanning for all items, optionally using the new [datalab pURL service](https://purl.datalab-org.io/) when configured with `VUE_APP_QR_CODE_RESOLVER_URL`.
@@ -91,6 +95,7 @@ Many thanks to all contributors: developers, user feedback and deployment manage
9195
This release primarily contains some bugfixes for the echem block, as well as tidying in preparation of the next release.
9296

9397
### What's Changed
98+
9499
* Removed unused css by @BenjaminCharmes in https://github.com/datalab-org/datalab/pull/826
95100
* Remove final mentions of odbx.science by @ml-evs in https://github.com/datalab-org/datalab/pull/827
96101
* Add routes for resolving items by refcode by @ml-evs in https://github.com/datalab-org/datalab/pull/807

0 commit comments

Comments
 (0)