Skip to content

Commit 5d5668f

Browse files
cmnrdlhstrh
authored and
Copybara Bot
committed
Merge pull request #668 from xronos-inc/release-v0.11.1
## Improvements 🛠️ **VS Code Extension**: - Support for MacOS - Windows support through WSL ## Fixes 🐛 - Stabilized initialization of the diagram view --------- Co-authored-by: Christian Menard <christian@xronos.com> Co-authored-by: Marten Lohstroh <marten@xronos.com> GitOrigin-RevId: 108da03d2f3305e0a0d446bed02c7e157459d997
1 parent fb57a49 commit 5d5668f

22 files changed

Lines changed: 99 additions & 86 deletions

File tree

‎cpp-sdk/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.28)
22

33
project(xronos-sdk
44
LANGUAGES CXX
5-
VERSION "0.11.0"
5+
VERSION "0.11.1"
66
HOMEPAGE_URL "https://docs.xronos.com"
77
DESCRIPTION "The Xronos C++ SDK for writing reactor programs."
88
)
9-
set(PROJECT_VERSION "0.11.0")
9+
set(PROJECT_VERSION "0.11.1")
1010

1111
# require C++ 20
1212
set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard." FORCE)

‎cpp-sdk/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ WORKDIR /xronos/cpp-sdk/build
3636
RUN cpack
3737

3838
FROM scratch AS pkgs
39-
COPY --from=pkgs-builder /xronos/cpp-sdk/pkgs /pkgs
39+
COPY --from=pkgs-builder /xronos/cpp-sdk/pkgs /
4040

4141
FROM cmake-init AS test
4242
COPY --from=third-party-files /third-party/googletest ../third-party/googletest

‎dev-requirements.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ build==1.4.2
1010
# via -r dev-requirements.in
1111
iniconfig==2.3.0
1212
# via pytest
13-
librt==0.7.4
13+
librt==0.9.0
1414
# via mypy
15-
mypy==1.19.1
15+
mypy==1.20.0
1616
# via -r dev-requirements.in
1717
mypy-extensions==1.1.0
1818
# via mypy
@@ -26,7 +26,7 @@ packaging==25.0
2626
# wheel
2727
patchelf==0.17.2.4
2828
# via -r dev-requirements.in
29-
pathspec==0.12.1
29+
pathspec==1.0.4
3030
# via mypy
3131
pluggy==1.6.0
3232
# via pytest
@@ -38,7 +38,7 @@ pyproject-hooks==1.2.0
3838
# via build
3939
pyright==1.1.408
4040
# via -r dev-requirements.in
41-
pytest==9.0.2
41+
pytest==9.0.3
4242
# via
4343
# -r dev-requirements.in
4444
# pytest-mock
@@ -47,7 +47,7 @@ pytest-mock==3.15.1
4747
# via -r dev-requirements.in
4848
pytest-subprocess==1.5.4
4949
# via -r dev-requirements.in
50-
ruff==0.15.8
50+
ruff==0.15.10
5151
# via -r dev-requirements.in
5252
typing-extensions==4.15.0
5353
# via

‎docker-bake.hcl‎

Lines changed: 62 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
variable "CONTEXT_PREFIX" { default = "." }
22

3-
variable "XRONOS_VERSION" { default = "0.11.0" }
3+
variable "XRONOS_VERSION" { default = "0.11.1" }
4+
5+
variable "ALL_PLATFORMS" { default = 0 }
6+
7+
variable "_platform_list" {
8+
default = ALL_PLATFORMS > 0 ? ["linux/arm64", "linux/amd64"] : []
9+
}
410

511
target "base" {
6-
target = "base"
7-
context = CONTEXT_PREFIX
8-
output = [{ type = "cacheonly" }]
12+
target = "base"
13+
context = CONTEXT_PREFIX
14+
output = [{ type = "cacheonly" }]
15+
platforms = _platform_list
916
}
1017

1118
target "py-venv" {
@@ -16,28 +23,32 @@ target "py-venv" {
1623
args = {
1724
python_version = version
1825
}
19-
target = "py-venv"
20-
context = CONTEXT_PREFIX
21-
output = [{ type = "cacheonly" }]
26+
target = "py-venv"
27+
context = CONTEXT_PREFIX
28+
output = [{ type = "cacheonly" }]
29+
platforms = _platform_list
2230
}
2331

2432
target "configs" {
25-
target = "configs"
26-
context = CONTEXT_PREFIX
27-
output = [{ type = "cacheonly" }]
33+
target = "configs"
34+
context = CONTEXT_PREFIX
35+
output = [{ type = "cacheonly" }]
36+
platforms = _platform_list
2837
}
2938

3039
target "third-party-cmake-files" {
31-
context = "${CONTEXT_PREFIX}/third-party"
32-
output = [{ type = "cacheonly" }]
40+
context = "${CONTEXT_PREFIX}/third-party"
41+
output = [{ type = "cacheonly" }]
42+
platforms = _platform_list
3343
}
3444

3545
target "_third-party-common" {
3646
target = "install"
3747
contexts = {
3848
base = "target:base"
3949
}
40-
output = [{ type = "cacheonly" }]
50+
output = [{ type = "cacheonly" }]
51+
platforms = _platform_list
4152
}
4253

4354
target "third-party-absl" {
@@ -83,9 +94,10 @@ target "third-party-doxygen" {
8394
}
8495

8596
target "xronos-lib-src" {
86-
target = "src"
87-
context = "${CONTEXT_PREFIX}/lib"
88-
output = [{ type = "cacheonly" }]
97+
target = "src"
98+
context = "${CONTEXT_PREFIX}/lib"
99+
output = [{ type = "cacheonly" }]
100+
platforms = _platform_list
89101
}
90102

91103
target "xronos-lib-lint" {
@@ -118,15 +130,17 @@ target "xronos-lib-test" {
118130
}
119131

120132
target "xronos-lib-graph-messages-rust-src" {
121-
target = "rust-src"
122-
context = "${CONTEXT_PREFIX}/lib/graph-messages"
123-
output = [{ type = "cacheonly" }]
133+
target = "rust-src"
134+
context = "${CONTEXT_PREFIX}/lib/graph-messages"
135+
output = [{ type = "cacheonly" }]
136+
platforms = _platform_list
124137
}
125138

126139
target "xronos-cpp-sdk-src" {
127-
target = "src"
128-
context = "${CONTEXT_PREFIX}/cpp-sdk"
129-
output = [{ type = "cacheonly" }]
140+
target = "src"
141+
context = "${CONTEXT_PREFIX}/cpp-sdk"
142+
output = [{ type = "cacheonly" }]
143+
platforms = _platform_list
130144
}
131145

132146
target "xronos-cpp-sdk-install" {
@@ -156,7 +170,7 @@ target "xronos-cpp-sdk-lint" {
156170
target "xronos-cpp-sdk-pkgs" {
157171
inherits = ["xronos-cpp-sdk-install"]
158172
target = "pkgs"
159-
output = ["${CONTEXT_PREFIX}/cpp-sdk"]
173+
output = ["${CONTEXT_PREFIX}/cpp-sdk/pkgs"]
160174
}
161175

162176
target "xronos-cpp-sdk-docs" {
@@ -165,7 +179,8 @@ target "xronos-cpp-sdk-docs" {
165179
contexts = {
166180
doxygen = "target:third-party-doxygen"
167181
}
168-
output = ["${CONTEXT_PREFIX}/cpp-sdk"]
182+
output = ["${CONTEXT_PREFIX}/cpp-sdk"]
183+
platforms = []
169184
}
170185

171186
target "xronos-py-wheel" {
@@ -179,7 +194,8 @@ target "xronos-py-wheel" {
179194
py-venv = "target:py-venv-${replace(version, ".", "")}"
180195
cpp-sdk = "target:xronos-cpp-sdk-install"
181196
}
182-
output = ["${CONTEXT_PREFIX}/python-sdk"]
197+
output = ["${CONTEXT_PREFIX}/python-sdk/dist"]
198+
platforms = _platform_list
183199
}
184200

185201
target "xronos-py-sdist" {
@@ -191,13 +207,15 @@ target "xronos-py-sdist" {
191207
lib-src = "target:xronos-lib-src"
192208
third-party-src = "target:third-party-cmake-files"
193209
}
194-
output = ["${CONTEXT_PREFIX}/python-sdk"]
210+
output = ["${CONTEXT_PREFIX}/python-sdk/dist"]
211+
platforms = []
195212
}
196213

197214
target "xronos-py-test-src" {
198-
target = "test-src"
199-
context = "${CONTEXT_PREFIX}/python-sdk"
200-
output = [{ type = "cacheonly" }]
215+
target = "test-src"
216+
context = "${CONTEXT_PREFIX}/python-sdk"
217+
output = [{ type = "cacheonly" }]
218+
platforms = _platform_list
201219
}
202220

203221
target "xronos-py-test" {
@@ -210,6 +228,7 @@ target "xronos-py-test" {
210228
output = [{ type = "cacheonly" }]
211229
}
212230

231+
213232
target "xronos-py-lint-py" {
214233
inherits = ["xronos-py-test-312"]
215234
target = "lint-py"
@@ -224,9 +243,10 @@ target "xronos-py-lint-cpp" {
224243
}
225244

226245
target "xronos-examples-common-files" {
227-
target = "common-files"
228-
context = "${CONTEXT_PREFIX}/examples"
229-
output = [{ type = "cacheonly" }]
246+
target = "common-files"
247+
context = "${CONTEXT_PREFIX}/examples"
248+
output = [{ type = "cacheonly" }]
249+
platforms = _platform_list
230250
}
231251

232252
target "_xronos-examples-common" {
@@ -239,7 +259,8 @@ target "_xronos-examples-common" {
239259
py-venv = "target:py-venv-${replace(version, ".", "")}"
240260
xronos-wheel = "target:xronos-py-wheel-${replace(version, ".", "")}"
241261
}
242-
output = [{ type = "cacheonly" }]
262+
output = [{ type = "cacheonly" }]
263+
platforms = _platform_list
243264
}
244265

245266
target "xronos-examples-hello-ros2-comparison-lint" {
@@ -358,26 +379,18 @@ target "xronos-examples-yolo-lint" {
358379
context = "${CONTEXT_PREFIX}/examples/YOLO/"
359380
}
360381

361-
target "xronos-examples-yolo-lint" {
362-
name = "xronos-examples-yolo-lint-${replace(version, ".", "")}"
363-
inherits = ["_xronos-examples-common-${replace(version, ".", "")}"]
364-
matrix = {
365-
version = ["3.12"]
366-
}
367-
target = "lint"
368-
context = "${CONTEXT_PREFIX}/examples/YOLO/"
369-
}
370-
371382
target "xronos-examples-src" {
372-
target = "src"
373-
context = "${CONTEXT_PREFIX}/examples"
374-
output = [{ type = "cacheonly" }]
383+
target = "src"
384+
context = "${CONTEXT_PREFIX}/examples"
385+
output = [{ type = "cacheonly" }]
386+
platforms = _platform_list
375387
}
376388

377389
target "bake-check-format" {
378-
context = CONTEXT_PREFIX
379-
target = "check-format"
380-
output = [{ type = "cacheonly" }]
390+
context = CONTEXT_PREFIX
391+
target = "check-format"
392+
output = [{ type = "cacheonly" }]
393+
platforms = []
381394
}
382395

383396
variable "LINT_TARGETS" {

‎examples/YOLO/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY requirements.txt ./
66
RUN sed -i /^xronos/d requirements.txt
77
RUN . /venv/bin/activate && pip install --no-cache-dir -r requirements.txt
88
COPY --from=common-files /xronos/examples/* ./
9-
RUN --mount=from=xronos-wheel,source=/dist,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
9+
RUN --mount=from=xronos-wheel,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
1010

1111
WORKDIR /xronos/examples/YOLO
1212
COPY *.py .

‎examples/YOLO/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
numpy==2.4.3
2-
ultralytics==8.4.30
3-
xronos==0.11.0
1+
numpy==2.4.4
2+
ultralytics==8.4.36
3+
xronos==0.11.1

‎examples/hello-ros2-comparison/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
FROM py-venv AS common
44
WORKDIR /xronos/examples
55
COPY --from=common-files /xronos/examples/* ./
6-
RUN --mount=from=xronos-wheel,source=/dist,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
6+
RUN --mount=from=xronos-wheel,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
77
WORKDIR /xronos/examples/hello-ros2-comparison
88
COPY --parents xronos ros .
99

‎examples/isaac/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY requirements.txt ./
66
RUN sed -i /^xronos/d requirements.txt
77
RUN . /venv/bin/activate && pip install --no-cache-dir -r requirements.txt
88
COPY --from=common-files /xronos/examples/* ./
9-
RUN --mount=from=xronos-wheel,source=/dist,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
9+
RUN --mount=from=xronos-wheel,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
1010

1111
WORKDIR /xronos/examples/isaac
1212
COPY --parents isaac_demo isaac_demo

‎examples/isaac/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
isaacsim==5.1.0
2-
xronos==0.11.0
2+
xronos==0.11.1

‎examples/keyboard-synth/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY requirements.txt ./
66
RUN sed -i /^xronos/d requirements.txt
77
RUN . /venv/bin/activate && pip install --no-cache-dir -r requirements.txt
88
COPY --from=common-files /xronos/examples/* ./
9-
RUN --mount=from=xronos-wheel,source=/dist,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
9+
RUN --mount=from=xronos-wheel,target=/dist . /venv/bin/activate && pip install --no-cache-dir /dist/xronos-*.whl
1010

1111
WORKDIR /xronos/examples/keyboard-synth
1212
COPY *.py .

0 commit comments

Comments
 (0)