Skip to content

Commit 848edc5

Browse files
committed
Merge branch 'master' into qctx
* master: Bump astral-sh/setup-uv from 6 to 7 (#4589) fix markdown in FAQ.md (#4584) fix typo in FAQ.md (#4585) Migrate from `react-test-renderer` to `@testing-library/react` (#4540) Convert @material-ui/icons to namespace imports (#4581) Fix `PackageRevision` GQL cache (#4583)
2 parents 9017b47 + 94addfc commit 848edc5

67 files changed

Lines changed: 1222 additions & 1570 deletions

File tree

Some content is hidden

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

.github/workflows/deploy-lambdas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
contents: read
3131
steps:
3232
- uses: actions/checkout@v5
33-
- uses: astral-sh/setup-uv@v6
33+
- uses: astral-sh/setup-uv@v7
3434
- name: Export requirements.txt from uv.lock
3535
if: ${{ hashFiles(format('lambdas/{0}/uv.lock', matrix.path)) != '' }}
3636
run: |

.github/workflows/py-ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
working-directory: api/python
1717
steps:
1818
- uses: actions/checkout@v5
19-
- uses: astral-sh/setup-uv@v6
19+
- uses: astral-sh/setup-uv@v7
2020
- name: Lint
2121
run: uv run poe lint
2222

@@ -27,15 +27,15 @@ jobs:
2727
working-directory: api/python
2828
steps:
2929
- uses: actions/checkout@v5
30-
- uses: astral-sh/setup-uv@v6
30+
- uses: astral-sh/setup-uv@v7
3131
- name: Check formatting (quilt3)
3232
run: uv run poe fmt --check
3333

3434
lint-rest:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- uses: actions/checkout@v5
38-
- uses: astral-sh/setup-uv@v6
38+
- uses: astral-sh/setup-uv@v7
3939
- name: Run Ruff linter on entire codebase
4040
run: uvx ruff@0.12.11 check . --exclude catalog/ --exclude api/python/
4141

@@ -44,7 +44,7 @@ jobs:
4444
# runs-on: ubuntu-latest
4545
# steps:
4646
# - uses: actions/checkout@v5
47-
# - uses: astral-sh/setup-uv@v6
47+
# - uses: astral-sh/setup-uv@v7
4848
# - name: Check formatting (rest of codebase)
4949
# run: uvx ruff@0.12.11 format --check --exclude catalog/ --exclude api/python/
5050

@@ -57,7 +57,7 @@ jobs:
5757
QUILT_DISABLE_USAGE_METRICS: true
5858
steps:
5959
- uses: actions/checkout@v5
60-
- uses: astral-sh/setup-uv@v6
60+
- uses: astral-sh/setup-uv@v7
6161
- name: Check generated docs are up-to-date
6262
run: uv run poe gendocs-check
6363

@@ -70,7 +70,7 @@ jobs:
7070
working-directory: api/python
7171
steps:
7272
- uses: actions/checkout@v5
73-
- uses: astral-sh/setup-uv@v6
73+
- uses: astral-sh/setup-uv@v7
7474
- name: Test codeblocks
7575
run: uv run poe testdocs
7676

@@ -87,7 +87,7 @@ jobs:
8787
working-directory: api/python
8888
steps:
8989
- uses: actions/checkout@v5
90-
- uses: astral-sh/setup-uv@v6
90+
- uses: astral-sh/setup-uv@v7
9191
- name: Run Pytest
9292
run: uv run --python ${{ matrix.python-version }} poe test-cov --cov-report xml
9393
- uses: codecov/codecov-action@v5
@@ -123,7 +123,7 @@ jobs:
123123
working-directory: api/python
124124
steps:
125125
- uses: actions/checkout@v5
126-
- uses: astral-sh/setup-uv@v6
126+
- uses: astral-sh/setup-uv@v7
127127
- name: verify git tag vs. version
128128
run: uv run poe verify-release-tag "${{ github.ref_name }}"
129129
- name: build
@@ -162,7 +162,7 @@ jobs:
162162
- uses: actions/setup-python@v6
163163
with:
164164
python-version-file: lambdas/${{ matrix.path }}/.python-version
165-
- uses: astral-sh/setup-uv@v6
165+
- uses: astral-sh/setup-uv@v7
166166
- name: Export requirements.txt from uv.lock
167167
if: ${{ hashFiles(format('lambdas/{0}/uv.lock', matrix.path)) != '' }}
168168
run: |

.github/workflows/test-quilt3-admin-codegen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
working-directory: ./api/python
2525
steps:
2626
- uses: actions/checkout@v5
27-
- uses: astral-sh/setup-uv@v6
27+
- uses: astral-sh/setup-uv@v7
2828
- name: Check GraphQL client is up-to-date
2929
run: uv run poe gql-check

catalog/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ where verb is one of
1818

1919
## Changes
2020

21+
- [Changed] Migrate unit-tests from `react-test-renderer` to `@testing-library/react` ([#4540](https://github.com/quiltdata/quilt/pull/4540))
22+
- [Changed] Request required fields for `PackageRevision` to proper cache ([#4583](https://github.com/quiltdata/quilt/pull/4583))
2123
- [Changed] Qurator: make tool messages less prominent ([#4572](https://github.com/quiltdata/quilt/pull/4572))
2224
- [Fixed] Qurator: Limit total search results contents context to 100k characters to avoid context window overflow ([#4573](https://github.com/quiltdata/quilt/pull/4573))
2325
- [Fixed] Empty directory upload on Bucket tab ([#4552](https://github.com/quiltdata/quilt/pull/4552))

catalog/app/components/Assistant/UI/Chat/DevTools.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import * as Eff from 'effect'
22
import * as React from 'react'
33
import * as M from '@material-ui/core'
4-
import {
5-
Clear as ClearIcon,
6-
Delete as DeleteIcon,
7-
GetApp as GetAppIcon,
8-
} from '@material-ui/icons'
4+
import * as Icons from '@material-ui/icons'
95

106
import JsonDisplay from 'components/JsonDisplay'
117

@@ -52,7 +48,7 @@ function ModelIdOverride({ value, setValue }: ModelIdOverrideProps) {
5248
size="small"
5349
>
5450
<M.Tooltip arrow title="Clear model ID override">
55-
<ClearIcon />
51+
<Icons.Clear />
5652
</M.Tooltip>
5753
</M.IconButton>
5854
</M.InputAdornment>
@@ -123,15 +119,15 @@ function RecordingControls({ enabled, log, enable, clear }: RecordingControlsPro
123119
onClick={handleDownload}
124120
size="small"
125121
variant="outlined"
126-
startIcon={<GetAppIcon />}
122+
startIcon={<Icons.GetApp />}
127123
>
128124
Download Log
129125
</M.Button>
130126
<M.Button
131127
onClick={clear}
132128
size="small"
133129
variant="outlined"
134-
startIcon={<DeleteIcon />}
130+
startIcon={<Icons.Delete />}
135131
>
136132
Clear Log
137133
</M.Button>

catalog/app/components/BreadCrumbs/BreadCrumbs.spec.tsx

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,55 @@
11
import * as React from 'react'
2-
import renderer from 'react-test-renderer'
2+
import { render } from '@testing-library/react'
33
import { MemoryRouter } from 'react-router-dom'
44

55
import * as BreadCrumbs from './'
66

77
describe('components/BreadCrumbs', () => {
88
describe('Segment', () => {
99
it('should render EMPTY', () => {
10-
const tree = renderer.create(<BreadCrumbs.Segment />).toJSON()
11-
expect(tree).toMatchSnapshot()
10+
const { container } = render(<BreadCrumbs.Segment />)
11+
expect(container).toMatchSnapshot()
1212
})
1313
it('should render label', () => {
14-
const tree = renderer.create(<BreadCrumbs.Segment label="Lorem ipsum" />).toJSON()
15-
expect(tree).toMatchSnapshot()
14+
const { container } = render(<BreadCrumbs.Segment label="Lorem ipsum" />)
15+
expect(container).toMatchSnapshot()
1616
})
1717
it('should render link', () => {
18-
const tree = renderer
19-
.create(
20-
<MemoryRouter>
21-
<BreadCrumbs.Segment label="A" to="/a" />
22-
</MemoryRouter>,
23-
)
24-
.toJSON()
25-
expect(tree).toMatchSnapshot()
18+
const { container } = render(
19+
<MemoryRouter>
20+
<BreadCrumbs.Segment label="A" to="/a" />
21+
</MemoryRouter>,
22+
)
23+
expect(container).toMatchSnapshot()
2624
})
2725
})
2826
describe('render', () => {
2927
it('basic breadcrumbs', () => {
3028
const crumbs = BreadCrumbs.getCrumbs('aa a/bb-b/c/d_d', (x) => x, 'ROOT')
31-
const tree = renderer
32-
.create(<MemoryRouter>{BreadCrumbs.render(crumbs)}</MemoryRouter>)
33-
.toJSON()
34-
expect(tree).toMatchSnapshot()
29+
const { container } = render(
30+
<MemoryRouter>{BreadCrumbs.render(crumbs)}</MemoryRouter>,
31+
)
32+
expect(container).toMatchSnapshot()
3533
})
3634
it('and transform links', () => {
3735
const crumbs = BreadCrumbs.getCrumbs('a/b', (x) => x, 'ROOT')
3836
const getLinkProps = ({ to }: { to?: string }) => ({
3937
href: `https://quiltdata.com/${to || ''}`,
4038
})
41-
const tree = renderer
42-
.create(
43-
<MemoryRouter>{BreadCrumbs.render(crumbs, { getLinkProps })}</MemoryRouter>,
44-
)
45-
.toJSON()
46-
expect(tree).toMatchSnapshot()
39+
const { container } = render(
40+
<MemoryRouter>{BreadCrumbs.render(crumbs, { getLinkProps })}</MemoryRouter>,
41+
)
42+
expect(container).toMatchSnapshot()
4743
})
4844
it('and make links for every crumb', () => {
4945
const crumbs = BreadCrumbs.getCrumbs('a/b', (x) => x, 'ROOT', { tailLink: true })
5046
const getLinkProps = ({ to }: { to?: string }) => ({
5147
href: `https://quiltdata.com/${to || ''}`,
5248
})
53-
const tree = renderer
54-
.create(
55-
<MemoryRouter>{BreadCrumbs.render(crumbs, { getLinkProps })}</MemoryRouter>,
56-
)
57-
.toJSON()
58-
expect(tree).toMatchSnapshot()
49+
const { container } = render(
50+
<MemoryRouter>{BreadCrumbs.render(crumbs, { getLinkProps })}</MemoryRouter>,
51+
)
52+
expect(container).toMatchSnapshot()
5953
})
6054
it('and end with separator', () => {
6155
const crumbs = BreadCrumbs.getCrumbs('a/b', (x) => x, 'ROOT', {
@@ -65,19 +59,17 @@ describe('components/BreadCrumbs', () => {
6559
const getLinkProps = ({ to }: { to?: string }) => ({
6660
href: `https://quiltdata.com/${to || ''}`,
6761
})
68-
const tree = renderer
69-
.create(
70-
<MemoryRouter>{BreadCrumbs.render(crumbs, { getLinkProps })}</MemoryRouter>,
71-
)
72-
.toJSON()
73-
expect(tree).toMatchSnapshot()
62+
const { container } = render(
63+
<MemoryRouter>{BreadCrumbs.render(crumbs, { getLinkProps })}</MemoryRouter>,
64+
)
65+
expect(container).toMatchSnapshot()
7466
})
7567
it('without root label', () => {
7668
const crumbs = BreadCrumbs.getCrumbs('a/b/c', (x) => x)
77-
const tree = renderer
78-
.create(<MemoryRouter>{BreadCrumbs.render(crumbs)}</MemoryRouter>)
79-
.toJSON()
80-
expect(tree).toMatchSnapshot()
69+
const { container } = render(
70+
<MemoryRouter>{BreadCrumbs.render(crumbs)}</MemoryRouter>,
71+
)
72+
expect(container).toMatchSnapshot()
8173
})
8274
})
8375
it('copyWithoutSpaces', () => {

0 commit comments

Comments
 (0)