From 2ee0569a227b7eac88073bd650621f54a3d3a5b9 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 22 Mar 2024 09:32:59 -0400 Subject: [PATCH] restrict schema tests using ndarray-1.0.0 to stardard 1.5.0 The next version of the ASDF standard (1.6.0) contains a new version of the ndarray schema (ndarray-1.1.0). Examples that explicitly use ndarray-1.0.0 will only work with the older standard versions (<1.6.0). This doesn't impact file reading and writing (as if 1.5.0 is used for write, ndarray-1.0.0 will be used, if 1.6.0 is used, ndarray-1.1.0 will be used). However the schema examples require hard-coded yaml that is less flexible than real files and require a restriction like that added in this commit. --- .../weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml | 1 + .../weldx.bam.de/weldx/core/geometry/spatial_data-0.1.1.yaml | 2 ++ weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml | 1 + weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.1.yaml | 2 ++ .../core/transformations/local_coordinate_system-0.1.0.yaml | 4 ++++ .../core/transformations/local_coordinate_system-0.1.1.yaml | 4 ++++ .../weldx/core/transformations/rotation-0.1.0.yaml | 4 ++++ .../weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml | 1 + .../weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.1.yaml | 1 + .../weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml | 1 + weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml | 1 + .../schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml | 1 + weldx/schemas/weldx.bam.de/weldx/units/quantity-0.1.0.yaml | 2 ++ 13 files changed, 25 insertions(+) diff --git a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml index 2745fdc20..16a815d9a 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml @@ -11,6 +11,7 @@ description: | examples: - - A simple `SpatialData` with triangulation + - asdf-standard-1.5.0 - | ! coordinates: !core/ndarray-1.0.0 diff --git a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.1.yaml b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.1.yaml index 1c549ecaf..11089bc8e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.1.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.1.yaml @@ -12,6 +12,7 @@ description: | examples: - - A simple `SpatialData` with triangulation + - asdf-standard-1.5.0 - | ! coordinates: ! @@ -32,6 +33,7 @@ examples: shape: [2, 3] - - A `SpatialData` object with data in three dimensions + - asdf-standard-1.5.0 - | ! coordinates: ! diff --git a/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml index 1055276c6..5a69c463e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml @@ -17,6 +17,7 @@ examples: value: 10.0 - - A time_series describing a sine oscillation in 3d space along the z-axis + - asdf-standard-1.5.0 - | ! expression: ! diff --git a/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.1.yaml b/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.1.yaml index 08e7cb8ed..795974bdc 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.1.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.1.yaml @@ -17,6 +17,7 @@ examples: value: 10.0 - - A time series of 4 discrete points + - asdf-standard-1.5.0 - | ! values: !core/ndarray-1.0.0 @@ -33,6 +34,7 @@ examples: interpolation: step - - A time_series describing a sine oscillation in 3d space along the z-axis + - asdf-standard-1.5.0 - | ! expression: ! diff --git a/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.0.yaml index 10b3d5a28..e36b5246b 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.0.yaml @@ -11,6 +11,7 @@ description: | examples: - - A constant transformation describing a translation of 1 mm into the z direction + - asdf-standard-1.5.0 - | ! coordinates: ! @@ -26,6 +27,7 @@ examples: - | A time dependent transformation describing a linear movement from 5 mm to 295 mm over 20 seconds along the x-axis direction. + - asdf-standard-1.5.0 - | ! time: ! @@ -50,6 +52,7 @@ examples: shape: [2, 3] - - A static transformation describing an euler rotation of 45 degree around the x-axis. + - asdf-standard-1.5.0 - | ! orientations: ! @@ -67,6 +70,7 @@ examples: - | A time dependent transformation describing an euler rotation around the y-axis from 0 degree to 120 degree over 20 seconds. + - asdf-standard-1.5.0 - | ! time: ! diff --git a/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.1.yaml b/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.1.yaml index 9f77ca9f0..01eba69c4 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.1.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.1.yaml @@ -11,6 +11,7 @@ description: | examples: - - A constant transformation describing a translation of 1 mm into the z direction + - asdf-standard-1.5.0 - | ! coordinates: ! @@ -26,6 +27,7 @@ examples: - | A time dependent transformation describing a linear movement from 5 mm to 295 mm over 20 seconds along the x-axis direction. + - asdf-standard-1.5.0 - | ! time: ! @@ -50,6 +52,7 @@ examples: shape: [2, 3] - - A static transformation describing an euler rotation of 45 degree around the x-axis. + - asdf-standard-1.5.0 - | ! orientations: ! @@ -67,6 +70,7 @@ examples: - | A time dependent transformation describing an euler rotation around the y-axis from 0 degree to 120 degree over 20 seconds. + - asdf-standard-1.5.0 - | ! time: ! diff --git a/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-0.1.0.yaml index 0f0cc06c5..a846f4efb 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-0.1.0.yaml @@ -11,6 +11,7 @@ description: | examples: - - A "xyz" euler rotation with 10, 20 and 60 degree angles as euler representation. + - asdf-standard-1.5.0 - | ! angles: ! @@ -22,6 +23,7 @@ examples: sequence: xyz - - The quaternion rotation representation + - asdf-standard-1.5.0 - | ! quaternions: !core/ndarray-1.0.0 @@ -30,6 +32,7 @@ examples: shape: [4] - - The matrix rotation representation. + - asdf-standard-1.5.0 - | ! matrix: !core/ndarray-1.0.0 @@ -41,6 +44,7 @@ examples: shape: [3, 3] - - The rotation vector representation. + - asdf-standard-1.5.0 - | ! rotvec: !core/ndarray-1.0.0 diff --git a/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml index fd1276afc..75f16a371 100644 --- a/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml @@ -66,6 +66,7 @@ properties: examples: - - Two seams with a single layer and bead, but the first seam has two weldments while the second has only one. + - asdf-standard-1.5.0 - | ! weld_seam: diff --git a/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.1.yaml b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.1.yaml index 7f995772c..d6c12e440 100644 --- a/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.1.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.1.yaml @@ -67,6 +67,7 @@ required: [weld_seam] examples: - - Two seams with a single layer and bead, but the first seam has two weldments while the second has only one. + - asdf-standard-1.5.0 - | ! weld_seam: diff --git a/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml index e8c5c0e4c..0005c42d1 100644 --- a/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml @@ -117,6 +117,7 @@ required: [process, equipment, workpiece, measurements, welding_current, welding examples: - - A simple welding application + - asdf-standard-1.5.0 - | ! TCP: ! diff --git a/weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml index fcc3b0b52..5c1f98618 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml @@ -34,6 +34,7 @@ examples: tag: CLOOS/pulse - - A spray arc process where the voltage decreases linearly from 40 V to 20 V over 10 s + - asdf-standard-1.5.0 - | ! base_process: spray diff --git a/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml index e5a8c5587..df89dd0d8 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml @@ -18,6 +18,7 @@ examples: max: ! P0DT0H0M10S - - An irregular timedeltaindex representing timestamps at 0 s, 4 s, 6 s and 10 s + - asdf-standard-1.5.0 - | ! values: !core/ndarray-1.0.0 diff --git a/weldx/schemas/weldx.bam.de/weldx/units/quantity-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/units/quantity-0.1.0.yaml index 3bf986fa9..81fa08d91 100644 --- a/weldx/schemas/weldx.bam.de/weldx/units/quantity-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/units/quantity-0.1.0.yaml @@ -18,12 +18,14 @@ examples: units: ! kilometer - - A quantity with an array of values + - asdf-standard-1.5.0 - | ! value: !core/ndarray-1.0.0 [1, 2, 3, 4] units: ! ampere - - A quantity with an n-dimensional array of values + - asdf-standard-1.5.0 - | ! value: !core/ndarray-1.0.0