Skip to content

Commit f8a93c1

Browse files
pcrespovpcrespov
committed
Merge branch 'master' into is23/registration-workflow
2 parents 426721a + 4289fb0 commit f8a93c1

File tree

146 files changed

+1969
-1331
lines changed

Some content is hidden

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

146 files changed

+1969
-1331
lines changed

‎.github/workflows/ci-testing-deploy.yml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,14 +1544,13 @@ jobs:
15441544
]
15451545
runs-on: ubuntu-latest
15461546
steps:
1547-
- name: a previous unit-test job failed
1548-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
1547+
- name: a previous unit-test job failed or was cancelled
1548+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
15491549
run: |
1550-
echo "::error title=ERROR::one of the unit-tests failed!"
1551-
echo "${{ join(needs.*.result, ',') }}"
1550+
echo "::error title=ERROR::one of the unit-tests failed or was cancelled!"
15521551
exit 1
15531552
- name: all the previous unit-tests were run successfully or skipped
1554-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
1553+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
15551554
run: echo "::notice All good!"
15561555

15571556
integration-test-webserver-01:
@@ -1876,13 +1875,13 @@ jobs:
18761875
]
18771876
runs-on: ubuntu-latest
18781877
steps:
1879-
- name: a previous integration-test job failed
1880-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
1878+
- name: a previous integration-test job failed or was cancelled
1879+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
18811880
run: |
1882-
echo "::error title=ERROR::one of the integration-tests failed!"
1881+
echo "::error title=ERROR::one of the integration-tests failed or was cancelled!"
18831882
exit 1
18841883
- name: all the previous integration-tests were run successfully or skipped
1885-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
1884+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
18861885
run: echo "::notice All good!"
18871886

18881887
system-test-public-api:
@@ -2111,13 +2110,13 @@ jobs:
21112110
]
21122111
runs-on: ubuntu-latest
21132112
steps:
2114-
- name: a previous system-test job failed
2115-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
2113+
- name: a previous system-test job failed or was cancelled
2114+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
21162115
run: |
2117-
echo "::error title=ERROR::one of the system-tests failed!"
2116+
echo "::error title=ERROR::one of the system-tests failed or was cancelled!"
21182117
exit 1
21192118
- name: all the previous system-tests were run successfully or skipped
2120-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
2119+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
21212120
run: echo "::notice All good!"
21222121

21232122
deploy:

‎ci/helpers/ensure_python_pip.bash‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎packages/aws-library/requirements/_tools.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ isort==6.0.1
2828
# pylint
2929
mccabe==0.7.0
3030
# via pylint
31-
mypy==1.15.0
31+
mypy==1.16.1
3232
# via -r requirements/../../../requirements/devenv.txt
33-
mypy-extensions==1.0.0
33+
mypy-extensions==1.1.0
3434
# via
3535
# black
3636
# mypy
@@ -43,7 +43,9 @@ packaging==24.2
4343
# black
4444
# build
4545
pathspec==0.12.1
46-
# via black
46+
# via
47+
# black
48+
# mypy
4749
pip==25.0.1
4850
# via pip-tools
4951
pip-tools==7.4.1

‎packages/celery-library/requirements/_test.txt‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ amqp==5.3.1
22
# via
33
# -c requirements/_base.txt
44
# kombu
5-
annotated-types==0.7.0
6-
# via
7-
# -c requirements/_base.txt
8-
# pydantic
95
anyio==4.9.0
106
# via
117
# -c requirements/_base.txt
128
# httpx
13-
# starlette
149
billiard==4.2.1
1510
# via
1611
# -c requirements/_base.txt
@@ -61,8 +56,6 @@ docker==7.1.0
6156
# pytest-docker-tools
6257
faker==37.3.0
6358
# via -r requirements/_test.in
64-
fastapi==0.115.12
65-
# via -r requirements/_test.in
6659
flexcache==0.3
6760
# via pint
6861
flexparser==0.4
@@ -113,15 +106,6 @@ psutil==7.0.0
113106
# pytest-celery
114107
py-cpuinfo==9.0.0
115108
# via pytest-benchmark
116-
pydantic==2.11.4
117-
# via
118-
# -c requirements/../../../requirements/constraints.txt
119-
# -c requirements/_base.txt
120-
# fastapi
121-
pydantic-core==2.33.2
122-
# via
123-
# -c requirements/_base.txt
124-
# pydantic
125109
pytest==8.3.5
126110
# via
127111
# -r requirements/_test.in
@@ -180,10 +164,6 @@ sniffio==1.3.1
180164
# via
181165
# -c requirements/_base.txt
182166
# anyio
183-
starlette==0.46.2
184-
# via
185-
# -c requirements/../../../requirements/constraints.txt
186-
# fastapi
187167
tenacity==9.1.2
188168
# via
189169
# -c requirements/_base.txt
@@ -194,17 +174,9 @@ typing-extensions==4.13.2
194174
# via
195175
# -c requirements/_base.txt
196176
# anyio
197-
# fastapi
198177
# flexcache
199178
# flexparser
200179
# pint
201-
# pydantic
202-
# pydantic-core
203-
# typing-inspection
204-
typing-inspection==0.4.0
205-
# via
206-
# -c requirements/_base.txt
207-
# pydantic
208180
tzdata==2025.2
209181
# via
210182
# -c requirements/_base.txt

‎packages/celery-library/requirements/_tools.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ isort==6.0.1
2828
# pylint
2929
mccabe==0.7.0
3030
# via pylint
31-
mypy==1.15.0
31+
mypy==1.16.1
3232
# via -r requirements/../../../requirements/devenv.txt
3333
mypy-extensions==1.1.0
3434
# via
@@ -43,7 +43,9 @@ packaging==25.0
4343
# black
4444
# build
4545
pathspec==0.12.1
46-
# via black
46+
# via
47+
# black
48+
# mypy
4749
pip==25.1.1
4850
# via pip-tools
4951
pip-tools==7.4.1

‎packages/common-library/requirements/_tools.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ isort==6.0.1
2626
# pylint
2727
mccabe==0.7.0
2828
# via pylint
29-
mypy==1.15.0
29+
mypy==1.16.1
3030
# via -r requirements/../../../requirements/devenv.txt
31-
mypy-extensions==1.0.0
31+
mypy-extensions==1.1.0
3232
# via
3333
# black
3434
# mypy
@@ -40,7 +40,9 @@ packaging==24.2
4040
# black
4141
# build
4242
pathspec==0.12.1
43-
# via black
43+
# via
44+
# black
45+
# mypy
4446
pip==25.0.1
4547
# via pip-tools
4648
pip-tools==7.4.1

‎packages/dask-task-models-library/requirements/_tools.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ isort==6.0.1
2727
# pylint
2828
mccabe==0.7.0
2929
# via pylint
30-
mypy==1.15.0
30+
mypy==1.16.1
3131
# via -r requirements/../../../requirements/devenv.txt
3232
mypy-extensions==1.1.0
3333
# via
@@ -42,7 +42,9 @@ packaging==25.0
4242
# black
4343
# build
4444
pathspec==0.12.1
45-
# via black
45+
# via
46+
# black
47+
# mypy
4648
pip==25.1.1
4749
# via pip-tools
4850
pip-tools==7.4.1

‎packages/models-library/requirements/_tools.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ mccabe==0.7.0
3131
# via pylint
3232
mdurl==0.1.2
3333
# via markdown-it-py
34-
mypy==1.15.0
34+
mypy==1.16.1
3535
# via -r requirements/../../../requirements/devenv.txt
36-
mypy-extensions==1.0.0
36+
mypy-extensions==1.1.0
3737
# via
3838
# black
3939
# mypy
@@ -45,7 +45,9 @@ packaging==24.2
4545
# black
4646
# build
4747
pathspec==0.12.1
48-
# via black
48+
# via
49+
# black
50+
# mypy
4951
pip==25.0.1
5052
# via pip-tools
5153
pip-tools==7.4.1

‎packages/models-library/src/models_library/api_schemas_webserver/projects_ui.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class SlideshowUI(TypedDict):
4040

4141

4242
class AnnotationUI(BaseModel):
43-
type: Literal["note", "rect", "text"]
44-
color: Annotated[Color, PlainSerializer(Color.as_hex)]
43+
type: Literal["note", "rect", "text", "conversation"]
44+
color: Annotated[Color | None, PlainSerializer(Color.as_hex)] = None
4545
attributes: Annotated[dict, Field(description="svg attributes")]
4646

4747
@staticmethod
@@ -71,6 +71,15 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
7171
"color": "#0000FF",
7272
"attributes": {"x": 415, "y": 100, "text": "Hey!"},
7373
},
74+
{
75+
"type": "conversation",
76+
"attributes": {
77+
"conversationId": 2,
78+
"x": 415,
79+
"y": 100,
80+
"title": "My chat",
81+
},
82+
},
7483
]
7584
},
7685
)
@@ -169,6 +178,15 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
169178
"fontSize": 12,
170179
},
171180
},
181+
"cf94f068-259c-4192-89f9-b2a56d51249d": {
182+
"type": "conversation",
183+
"attributes": {
184+
"conversationId": 2,
185+
"x": 119,
186+
"y": 223,
187+
"title": "My chat",
188+
},
189+
},
172190
},
173191
"current_node_id": "4b3345e5-861f-47b0-8b52-a4508449be79",
174192
"template_type": "hypertool",

‎packages/notifications-library/requirements/_test.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,17 @@ multidict==6.1.0
4848
# -c requirements/_base.txt
4949
# aiohttp
5050
# yarl
51-
mypy==1.15.0
51+
mypy==1.16.1
5252
# via sqlalchemy
53-
mypy-extensions==1.0.0
53+
mypy-extensions==1.1.0
5454
# via mypy
5555
packaging==24.2
5656
# via
5757
# -c requirements/_base.txt
5858
# pytest
5959
# pytest-sugar
60+
pathspec==0.12.1
61+
# via mypy
6062
pluggy==1.5.0
6163
# via pytest
6264
pprintpp==0.4.0

0 commit comments

Comments
 (0)