From a7263d11d34b64c322578a0d8ac4170255a0a859 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 17 Sep 2021 10:45:51 +0200 Subject: [PATCH 1/4] Add pre commit (#530) * add .pre-commit-config.yaml * exclude meta.yaml from yaml check * pre-commit run --all-files * add pre-commit ci job * fix action version * lint legacy files again * update config * add pydocstyle * pre-commit self lint (: * pydocstyle config options from setup.cfg --- .binder/postBuild | 2 +- .deepsource.toml | 2 +- .github/workflows/static_analysis.yml | 12 ++++++++ .pep8speaks.yml | 2 +- .pre-commit-config.yaml | 28 +++++++++++++++++++ .readthedocs.yml | 1 - MANIFEST.in | 2 +- devtools/conda.recipe/build_env.yml | 1 - devtools/conda.recipe/meta.yaml | 1 - devtools/doc/Makefile | 3 +- doc/_templates/class-template.rst | 1 - doc/conf.py | 4 +-- doc/standard.rst | 1 - setup.cfg | 5 ++-- weldx/asdf/file.py | 3 +- .../legacy/core/data_array-1.0.0.yaml | 2 +- .../legacy/core/dataset-1.0.0.yaml | 2 +- .../legacy/core/dimension-1.0.0.yaml | 2 +- .../core/geometry/spatial_data-1.0.0.yaml | 6 ++-- .../core/mathematical_expression-1.0.0.yaml | 2 +- .../legacy/core/time_series-1.0.0.yaml | 2 +- ...nate_system_hierarchy_subsystem-1.0.0.yaml | 2 +- .../coordinate_transformation-1.0.0.yaml | 2 +- .../core/transformations/rotation-1.0.0.yaml | 2 +- .../legacy/core/variable-1.0.0.yaml | 2 +- .../legacy/debug/test_property_tag-1.0.0.yaml | 2 +- .../debug/test_shape_validator-1.0.0.yaml | 2 +- .../debug/test_unit_validator-1.0.0.yaml | 2 +- .../measurement_equipment-1.0.0.yaml | 2 +- .../legacy/measurement/error-1.0.0.yaml | 2 +- .../legacy/measurement/measurement-1.0.0.yaml | 2 +- .../legacy/measurement/signal-1.0.0.yaml | 2 +- .../signal_transformation-1.0.0.yaml | 2 +- .../legacy/measurement/source-1.0.0.yaml | 2 +- .../legacy/process/CLOOS/pulse-1.0.0.yaml | 2 +- .../legacy/process/CLOOS/spray_arc-1.0.0.yaml | 2 +- .../legacy/process/GMAW-1.0.0.yaml | 2 +- .../legacy/process/generic-1.0.0.yaml | 2 +- .../legacy/process/terms-1.0.0.yaml | 2 +- .../legacy/time/datetimeindex-1.0.0.yaml | 2 -- .../legacy/time/timedeltaindex-1.0.0.yaml | 2 -- .../weldx/core/data_array-1.0.0.yaml | 2 +- .../weldx/core/dataset-1.0.0.yaml | 2 +- .../weldx/core/dimension-1.0.0.yaml | 2 +- .../core/geometry/spatial_data-1.0.0.yaml | 6 ++-- .../core/mathematical_expression-1.0.0.yaml | 2 +- .../weldx/core/time_series-1.0.0.yaml | 2 +- .../core/transformations/rotation-1.0.0.yaml | 2 +- .../weldx/core/variable-1.0.0.yaml | 2 +- .../weldx/debug/test_property_tag-1.0.0.yaml | 2 +- .../debug/test_shape_validator-1.0.0.yaml | 2 +- .../debug/test_unit_validator-1.0.0.yaml | 2 +- .../measurement_equipment-1.0.0.yaml | 2 +- .../weldx/measurement/error-1.0.0.yaml | 2 +- .../weldx/measurement/measurement-1.0.0.yaml | 2 +- .../weldx/measurement/signal-1.0.0.yaml | 2 +- .../signal_transformation-1.0.0.yaml | 2 +- .../weldx/measurement/source-1.0.0.yaml | 2 +- .../weldx/process/CLOOS/pulse-1.0.0.yaml | 2 +- .../weldx/process/CLOOS/spray_arc-1.0.0.yaml | 2 +- .../weldx/process/GMAW-1.0.0.yaml | 2 +- .../weldx/process/generic-1.0.0.yaml | 2 +- .../weldx/process/terms-1.0.0.yaml | 2 +- .../weldx/time/datetimeindex-1.0.0.yaml | 2 -- .../weldx/time/timedeltaindex-1.0.0.yaml | 2 -- .../manifests/test_standard-1.0.0.yaml | 2 +- ...ve_measurement_equipment_schema-1.0.0.yaml | 2 +- 67 files changed, 103 insertions(+), 77 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.binder/postBuild b/.binder/postBuild index cdc0c1ff6..6958e6b08 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -4,4 +4,4 @@ jupyter labextension install --no-build @jupyter-widgets/jupyterlab-manager k3d@2.9.7 --debug jupyter lab build --minimize=False --debug -python setup.py --version \ No newline at end of file +python setup.py --version diff --git a/.deepsource.toml b/.deepsource.toml index 149b0d2f8..fa96a1eed 100644 --- a/.deepsource.toml +++ b/.deepsource.toml @@ -16,4 +16,4 @@ exclude_patterns = [ [[analyzers]] name = "python" enabled = true -runtime_version = "3.x.x" \ No newline at end of file +runtime_version = "3.x.x" diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 86812ffb9..0615d3713 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -82,3 +82,15 @@ jobs: - name: run mypy run: | mypy --install-types --non-interactive . + + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.x + - name: Lint + uses: pre-commit/action@v2.0.3 + with: + extra_args: --all-files --show-diff-on-failure diff --git a/.pep8speaks.yml b/.pep8speaks.yml index 7873d7708..cd0ca4233 100644 --- a/.pep8speaks.yml +++ b/.pep8speaks.yml @@ -16,4 +16,4 @@ message: # Customize the comment made by the bot updated: # Messages when new commits are added to the PR header: "Hello @{name}! Thanks for updating this PR. " footer: "" # Why to comment the link to the style guide everytime? :) - no_errors: "There are currently no PEP 8 issues detected in this Pull Request. Cheers! :beers: " \ No newline at end of file + no_errors: "There are currently no PEP 8 issues detected in this Pull Request. Cheers! :beers: " diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..b0d7795d1 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,28 @@ +default_language_version: + python: python3.8 +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.0.1 + hooks: + - id: trailing-whitespace + args: [--markdown-linebreak-ext=md] + - id: end-of-file-fixer + - id: check-yaml + exclude: devtools/conda.recipe/meta.yaml # doesn't play nice with jinja +# - id: no-commit-to-branch # only makes sense for local pre-commit hooks +- repo: https://github.com/psf/black + rev: 21.9b0 + hooks: + - id: black +- repo: https://github.com/pycqa/isort + rev: 5.9.3 + hooks: + - id: isort +- repo: https://gitlab.com/pycqa/flake8 + rev: 3.9.2 + hooks: + - id: flake8 +- repo: https://github.com/pycqa/pydocstyle + rev: 6.1.1 + hooks: + - id: pydocstyle diff --git a/.readthedocs.yml b/.readthedocs.yml index 30aa3170a..faf6a5f89 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -24,4 +24,3 @@ sphinx: # image: testing conda: environment: doc/rtd_environment.yml - diff --git a/MANIFEST.in b/MANIFEST.in index fad08b89f..9c53bd32b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,4 +7,4 @@ prune devtools prune doc prune tutorials -global-exclude .* \ No newline at end of file +global-exclude .* diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index 24a93ba95..5615c991b 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -12,4 +12,3 @@ dependencies: - boa - anaconda-client - numpydoc>=0.5 - diff --git a/devtools/conda.recipe/meta.yaml b/devtools/conda.recipe/meta.yaml index 8d09b5ff7..1d36e3223 100644 --- a/devtools/conda.recipe/meta.yaml +++ b/devtools/conda.recipe/meta.yaml @@ -73,4 +73,3 @@ extra: - marscher - vhirtham - CagtayFabry - diff --git a/devtools/doc/Makefile b/devtools/doc/Makefile index dc43ac451..750b5e5d8 100644 --- a/devtools/doc/Makefile +++ b/devtools/doc/Makefile @@ -16,7 +16,7 @@ FILES= # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILD_DIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(DOC) +ALLSPHINXOPTS = -d $(BUILD_DIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(DOC) .PHONY: help clean html #------------------------------------------------------------------------------ @@ -45,4 +45,3 @@ latex: html_check: $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/html $(FILES) - diff --git a/doc/_templates/class-template.rst b/doc/_templates/class-template.rst index 7b995f9a1..3cd1abee3 100644 --- a/doc/_templates/class-template.rst +++ b/doc/_templates/class-template.rst @@ -32,4 +32,3 @@ {%- endfor %} {% endif %} {% endblock %} - diff --git a/doc/conf.py b/doc/conf.py index 346357b05..fd641b30c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -179,8 +179,8 @@ def _prevent_sphinx_circular_imports_bug(): :format: html .. nbinfo:: - - Run the interactive online version of this notebook (takes 1-2 minutes to load): + + Run the interactive online version of this notebook (takes 1-2 minutes to load): :raw-html:`Binder badge` """ diff --git a/doc/standard.rst b/doc/standard.rst index 70b21ef44..a05012e61 100644 --- a/doc/standard.rst +++ b/doc/standard.rst @@ -33,4 +33,3 @@ The WelDX ASDF Extension implements some additional functionalities like unit an standard/shape-validation standard/unit-validation standard/welding-processes - diff --git a/setup.cfg b/setup.cfg index 3a7a8983f..ec985a9ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -92,8 +92,9 @@ exclude = [pydocstyle] # convention numpy is currently equivalent to ignoring 'D107', 'D203', 'D212', 'D213', 'D402', 'D413' convention = numpy -match = (?!__)(?!_version)(?!conftest).*\.py -match_dir = [^\.][^\docs][^\tags].* +# match options need to be in "" for pre-commit +match = "(?!__)(?!_version)(?!conftest).*\.py" +match_dir = "[^\.][^\docs][^\tags].*" [tool:pytest] addopts = --tb=short --color=yes -rsw --cov=weldx --cov-report=term-missing:skip-covered --doctest-modules diff --git a/weldx/asdf/file.py b/weldx/asdf/file.py index bfb79059f..5f386f58d 100644 --- a/weldx/asdf/file.py +++ b/weldx/asdf/file.py @@ -15,11 +15,10 @@ from asdf.util import get_file_type from jsonschema import ValidationError +from weldx.asdf.util import get_schema_path, get_yaml_header, view_tree from weldx.types import SupportsFileReadWrite, types_file_like, types_path_and_file_like from weldx.util import inherit_docstrings -from weldx.asdf.util import get_schema_path, get_yaml_header, view_tree - __all__ = [ "WeldxFile", ] diff --git a/weldx/schemas/weldx.bam.de/legacy/core/data_array-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/data_array-1.0.0.yaml index 55d85b2e5..f894a5eb2 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/data_array-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/data_array-1.0.0.yaml @@ -30,4 +30,4 @@ properties: required: [attributes, coordinates, data] propertyOrder: [attributes, coordinates, data] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/dataset-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/dataset-1.0.0.yaml index 73b139ca4..dce4e2f57 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/dataset-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/dataset-1.0.0.yaml @@ -38,4 +38,4 @@ properties: required: [dimensions, coordinates, variables] propertyOrder: [attributes, dimensions, coordinates, variables] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/dimension-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/dimension-1.0.0.yaml index 98075c4ce..e3be181e0 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/dimension-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/dimension-1.0.0.yaml @@ -24,4 +24,4 @@ properties: required: [name, length] propertyOrder: [name, length] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/geometry/spatial_data-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/geometry/spatial_data-1.0.0.yaml index aeb5ddc0a..e6eb6d2af 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/geometry/spatial_data-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/geometry/spatial_data-1.0.0.yaml @@ -39,7 +39,7 @@ properties: datatype: type: string enum: [float32, float64] - wx_shape: [(:), 3] + wx_shape: [(~), 3] attributes: description: | An arbitrary set of attributes. For example, normals, colors or measured point data can be stored using this @@ -53,9 +53,9 @@ properties: datatype: type: string enum: [uint32, uint64] - wx_shape: [(:), 3] + wx_shape: [(~), 3] propertyOrder: [coordinates, attributes, triangles] required: [coordinates] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/mathematical_expression-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/mathematical_expression-1.0.0.yaml index 1fb4ac9d7..4c2a29ab9 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/mathematical_expression-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/mathematical_expression-1.0.0.yaml @@ -38,4 +38,4 @@ properties: required: [expression] propertyOrder: [expression, parameters] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/time_series-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/time_series-1.0.0.yaml index 0aef18c97..123045acb 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/time_series-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/time_series-1.0.0.yaml @@ -106,4 +106,4 @@ oneOf: propertyOrder: [expression, values, time, unit, shape, interpolation, values] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0.yaml index c9e34115c..18f7258e1 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0.yaml @@ -58,4 +58,4 @@ properties: propertyOrder: [name, parent_system, root_cs, members, subsystems] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_transformation-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_transformation-1.0.0.yaml index eeda8a4a9..89f753e2d 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_transformation-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/transformations/coordinate_transformation-1.0.0.yaml @@ -53,4 +53,4 @@ properties: propertyOrder: [name, reference_system, transformation] required: [name, reference_system, transformation] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/transformations/rotation-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/transformations/rotation-1.0.0.yaml index 0cd183fd8..2f5866c69 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/transformations/rotation-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/transformations/rotation-1.0.0.yaml @@ -99,4 +99,4 @@ oneOf: required: [sequence, angles] flowStyle: block additionalProperties: false -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/core/variable-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/core/variable-1.0.0.yaml index ed0093fda..c2df3c31b 100644 --- a/weldx/schemas/weldx.bam.de/legacy/core/variable-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/core/variable-1.0.0.yaml @@ -42,4 +42,4 @@ properties: required: [name, dimensions, dtype, data] propertyOrder: [name, dimensions, dtype, unit, data] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/debug/test_property_tag-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/debug/test_property_tag-1.0.0.yaml index 94e35e753..f8859eaf7 100644 --- a/weldx/schemas/weldx.bam.de/legacy/debug/test_property_tag-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/debug/test_property_tag-1.0.0.yaml @@ -13,4 +13,4 @@ description: | type: object additionalProperties: true # must be true to allow any property wx_property_tag: "tag:weldx.bam.de:weldx/time/timestamp-*" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/debug/test_shape_validator-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/debug/test_shape_validator-1.0.0.yaml index 38438c34f..f66e18a2f 100644 --- a/weldx/schemas/weldx.bam.de/legacy/debug/test_shape_validator-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/debug/test_shape_validator-1.0.0.yaml @@ -73,4 +73,4 @@ wx_shape: (p3): [a,2,n] time_prop: [m] (optional_prop): [a,2,n] -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/debug/test_unit_validator-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/debug/test_unit_validator-1.0.0.yaml index f68712527..5873756fc 100644 --- a/weldx/schemas/weldx.bam.de/legacy/debug/test_unit_validator-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/debug/test_unit_validator-1.0.0.yaml @@ -61,4 +61,4 @@ wx_unit: current_prop: A nested_prop: q2: "m*mm*cm" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/equipment/measurement_equipment-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/equipment/measurement_equipment-1.0.0.yaml index a9835f656..c43fecd28 100644 --- a/weldx/schemas/weldx.bam.de/legacy/equipment/measurement_equipment-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/equipment/measurement_equipment-1.0.0.yaml @@ -46,4 +46,4 @@ propertyOrder: [name, sources, transformations] required: [name] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/measurement/error-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/measurement/error-1.0.0.yaml index d4827502b..ca86a09f8 100644 --- a/weldx/schemas/weldx.bam.de/legacy/measurement/error-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/measurement/error-1.0.0.yaml @@ -26,4 +26,4 @@ properties: - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" required: [deviation] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/measurement/measurement-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/measurement/measurement-1.0.0.yaml index ef32ba047..8a632332a 100644 --- a/weldx/schemas/weldx.bam.de/legacy/measurement/measurement-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/measurement/measurement-1.0.0.yaml @@ -22,4 +22,4 @@ properties: propertyOrder: [name, data, measurement_chain] required: [name, data] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/measurement/signal-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/measurement/signal-1.0.0.yaml index 926ef82bc..76fcf35b1 100644 --- a/weldx/schemas/weldx.bam.de/legacy/measurement/signal-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/measurement/signal-1.0.0.yaml @@ -41,4 +41,4 @@ properties: propertyOrder: [signal_type, unit, data] required: [signal_type, unit] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/measurement/signal_transformation-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/measurement/signal_transformation-1.0.0.yaml index 64331eb38..d0699a954 100644 --- a/weldx/schemas/weldx.bam.de/legacy/measurement/signal_transformation-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/measurement/signal_transformation-1.0.0.yaml @@ -59,4 +59,4 @@ anyOf: propertyOrder: [name, error, func, type_transformation] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/measurement/source-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/measurement/source-1.0.0.yaml index 8aa5858e2..f0a826580 100644 --- a/weldx/schemas/weldx.bam.de/legacy/measurement/source-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/measurement/source-1.0.0.yaml @@ -37,4 +37,4 @@ properties: required: [name, output_signal] propertyOrder: [name, output_signal, error] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/pulse-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/pulse-1.0.0.yaml index a4926fcfe..ca5f0ae94 100644 --- a/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/pulse-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/pulse-1.0.0.yaml @@ -15,4 +15,4 @@ allOf: - oneOf: - $ref: "../terms-1.0.0#/process/pulse/UI" - $ref: "../terms-1.0.0#/process/pulse/II" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/spray_arc-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/spray_arc-1.0.0.yaml index 215835777..f6c8fd325 100644 --- a/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/spray_arc-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/process/CLOOS/spray_arc-1.0.0.yaml @@ -22,4 +22,4 @@ allOf: wx_unit: "V/A" required: [impedance,characteristic] -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/process/GMAW-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/process/GMAW-1.0.0.yaml index 2e96a7e72..e615b3f3e 100644 --- a/weldx/schemas/weldx.bam.de/legacy/process/GMAW-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/process/GMAW-1.0.0.yaml @@ -71,4 +71,4 @@ examples: tag: CLOOS/spray_arc $ref: "./terms-1.0.0#/base_process" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/process/generic-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/process/generic-1.0.0.yaml index 69b46a695..6c5b513cd 100644 --- a/weldx/schemas/weldx.bam.de/legacy/process/generic-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/process/generic-1.0.0.yaml @@ -10,4 +10,4 @@ spray: allOf: - $ref: "./terms-1.0.0#/base_process" - $ref: "./terms-1.0.0#/process/spray" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/process/terms-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/process/terms-1.0.0.yaml index 73038ee0e..238911055 100644 --- a/weldx/schemas/weldx.bam.de/legacy/process/terms-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/process/terms-1.0.0.yaml @@ -146,4 +146,4 @@ parameters: tag: "tag:weldx.bam.de:weldx/core/time_series-1.0.0" wx_unit: "A" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/legacy/time/datetimeindex-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/time/datetimeindex-1.0.0.yaml index 00128057c..23268b39d 100644 --- a/weldx/schemas/weldx.bam.de/legacy/time/datetimeindex-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/time/datetimeindex-1.0.0.yaml @@ -86,5 +86,3 @@ oneOf: required: [start, end, freq] propertyOrder: [start, end, freq, min, max] ... - - diff --git a/weldx/schemas/weldx.bam.de/legacy/time/timedeltaindex-1.0.0.yaml b/weldx/schemas/weldx.bam.de/legacy/time/timedeltaindex-1.0.0.yaml index 2c65e20c6..1d4ee0c46 100644 --- a/weldx/schemas/weldx.bam.de/legacy/time/timedeltaindex-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/legacy/time/timedeltaindex-1.0.0.yaml @@ -98,5 +98,3 @@ oneOf: required: [start, end, freq] propertyOrder: [start, end, freq, min, max] ... - - diff --git a/weldx/schemas/weldx.bam.de/weldx/core/data_array-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/data_array-1.0.0.yaml index d4c8a09b1..dcfc52a38 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/data_array-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/data_array-1.0.0.yaml @@ -29,4 +29,4 @@ properties: required: [attributes, coordinates, data] propertyOrder: [attributes, coordinates, data] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/dataset-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/dataset-1.0.0.yaml index dc471f3cf..6ea25119e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/dataset-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/dataset-1.0.0.yaml @@ -37,4 +37,4 @@ properties: required: [dimensions, coordinates, variables] propertyOrder: [attributes, dimensions, coordinates, variables] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/dimension-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/dimension-1.0.0.yaml index ad23ecd7c..ac08ff7d4 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/dimension-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/dimension-1.0.0.yaml @@ -23,4 +23,4 @@ properties: required: [name, length] propertyOrder: [name, length] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-1.0.0.yaml index 527705320..6dbe1ae26 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-1.0.0.yaml @@ -38,7 +38,7 @@ properties: datatype: type: string enum: [float32, float64] - wx_shape: [(:), 3] + wx_shape: [(~), 3] attributes: description: | An arbitrary set of attributes. For example, normals, colors or measured point data can be stored using this @@ -52,9 +52,9 @@ properties: datatype: type: string enum: [uint32, uint64] - wx_shape: [(:), 3] + wx_shape: [(~), 3] propertyOrder: [coordinates, attributes, triangles] required: [coordinates] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-1.0.0.yaml index 846648302..0873dce79 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-1.0.0.yaml @@ -39,4 +39,4 @@ properties: required: [expression] propertyOrder: [expression, parameters] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/time_series-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/time_series-1.0.0.yaml index 41ceb814d..db4a4d086 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/time_series-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/time_series-1.0.0.yaml @@ -105,4 +105,4 @@ oneOf: propertyOrder: [expression, values, time, unit, shape, interpolation, values] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-1.0.0.yaml index 136761608..b20664342 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/transformations/rotation-1.0.0.yaml @@ -100,4 +100,4 @@ oneOf: required: [sequence, angles] flowStyle: block additionalProperties: false -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/variable-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/variable-1.0.0.yaml index 98196fda2..1013d010b 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/variable-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/variable-1.0.0.yaml @@ -41,4 +41,4 @@ properties: required: [name, dimensions, dtype, data] propertyOrder: [name, dimensions, dtype, unit, data] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-1.0.0.yaml index 3f30a3682..bfb2433db 100644 --- a/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-1.0.0.yaml @@ -12,4 +12,4 @@ description: | type: object additionalProperties: true # must be true to allow any property wx_property_tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-1.0.0.yaml index 2fb5e93f3..d7603bd00 100644 --- a/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-1.0.0.yaml @@ -74,4 +74,4 @@ wx_shape: (p3): [a,2,n] time_prop: [m] (optional_prop): [a,2,n] -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-1.0.0.yaml index 92726d2f6..169b26516 100644 --- a/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-1.0.0.yaml @@ -68,4 +68,4 @@ wx_unit: current_prop: A nested_prop: q2: "m*mm*cm" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-1.0.0.yaml index 0a367d5c8..592c8fbda 100644 --- a/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-1.0.0.yaml @@ -45,4 +45,4 @@ propertyOrder: [name, sources, transformations] required: [name] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml index e72e15e4d..2f33f8db5 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml @@ -26,4 +26,4 @@ properties: - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" required: [deviation] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-1.0.0.yaml index 3daac6ebe..28d76c2b8 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-1.0.0.yaml @@ -21,4 +21,4 @@ properties: propertyOrder: [name, data, measurement_chain] required: [name, data] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/signal-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/signal-1.0.0.yaml index d58d3f70a..e02937940 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/signal-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/signal-1.0.0.yaml @@ -40,4 +40,4 @@ properties: propertyOrder: [signal_type, unit, data] required: [signal_type, unit] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-1.0.0.yaml index 572443d74..5519fa0b8 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-1.0.0.yaml @@ -58,4 +58,4 @@ anyOf: propertyOrder: [name, error, func, type_transformation] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/source-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/source-1.0.0.yaml index 8e7d3e2a6..f80866603 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/source-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/source-1.0.0.yaml @@ -36,4 +36,4 @@ properties: required: [name, output_signal] propertyOrder: [name, output_signal, error] flowStyle: block -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-1.0.0.yaml index 53d53a041..84635819d 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-1.0.0.yaml @@ -14,4 +14,4 @@ allOf: - oneOf: - $ref: "../terms-1.0.0#/process/pulse/UI" - $ref: "../terms-1.0.0#/process/pulse/II" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-1.0.0.yaml index e27e56f3a..be519c00d 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-1.0.0.yaml @@ -21,4 +21,4 @@ allOf: wx_unit: "V/A" required: [impedance,characteristic] -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/GMAW-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/GMAW-1.0.0.yaml index af48befe4..2df5a6069 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/GMAW-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/GMAW-1.0.0.yaml @@ -70,4 +70,4 @@ examples: tag: CLOOS/spray_arc $ref: "./terms-1.0.0#/base_process" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml index 27684bed1..35e88eacd 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml @@ -10,4 +10,4 @@ spray: allOf: - $ref: "./terms-1.0.0#/base_process" - $ref: "./terms-1.0.0#/process/spray" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/terms-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/terms-1.0.0.yaml index 5cd526344..7605ff902 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/terms-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/terms-1.0.0.yaml @@ -146,4 +146,4 @@ parameters: tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" wx_unit: "A" -... \ No newline at end of file +... diff --git a/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml index 2c754d226..78f5ed2c8 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml @@ -85,5 +85,3 @@ oneOf: required: [start, end, freq] propertyOrder: [start, end, freq, min, max] ... - - diff --git a/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml index bafc651b4..79dfc9038 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml @@ -97,5 +97,3 @@ oneOf: required: [start, end, freq] propertyOrder: [start, end, freq, min, max] ... - - diff --git a/weldx/tests/data/quality_standard/resources/test_organization/manifests/test_standard-1.0.0.yaml b/weldx/tests/data/quality_standard/resources/test_organization/manifests/test_standard-1.0.0.yaml index a15c0ba5b..f3294a179 100644 --- a/weldx/tests/data/quality_standard/resources/test_organization/manifests/test_standard-1.0.0.yaml +++ b/weldx/tests/data/quality_standard/resources/test_organization/manifests/test_standard-1.0.0.yaml @@ -9,4 +9,4 @@ asdf_standard_requirement: 1.0.0 # mappings tags: - uri: "asdf://weldx.bam.de/weldx/schemas/equipment/measurement_equipment-1.0.0" - file: "alternative_measurement_equipment_schema-1.0.0" \ No newline at end of file + file: "alternative_measurement_equipment_schema-1.0.0" diff --git a/weldx/tests/data/quality_standard/resources/test_organization/schemas/alternative_measurement_equipment_schema-1.0.0.yaml b/weldx/tests/data/quality_standard/resources/test_organization/schemas/alternative_measurement_equipment_schema-1.0.0.yaml index 9ce5d125b..ef5cfd377 100644 --- a/weldx/tests/data/quality_standard/resources/test_organization/schemas/alternative_measurement_equipment_schema-1.0.0.yaml +++ b/weldx/tests/data/quality_standard/resources/test_organization/schemas/alternative_measurement_equipment_schema-1.0.0.yaml @@ -34,4 +34,4 @@ propertyOrder: [name, sources, data_transformations] required: [name, wx_metadata] flowStyle: block -... \ No newline at end of file +... From 65477ea2d5fd11402d5447a00eeaf44aa3306e8f Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 17 Sep 2021 12:05:27 +0200 Subject: [PATCH 2/4] add pre-commit CI config (disable autofix for PRs) (#538) * add pre-commit CI config (disable autofix for PRs) * add badge * remove isort action * remove language default * update action name * fix action name --- .github/workflows/static_analysis.yml | 20 -------------------- .pre-commit-config.yaml | 12 ++++++++++-- README.md | 1 + 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 0615d3713..25279dfb1 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -39,26 +39,6 @@ jobs: run: | flake8 - isort: - name: isort - runs-on: ubuntu-latest - continue-on-error: true - strategy: - fail-fast: false - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: '3.8' - - name: pip installs - run: pip install isort==5.* - - name: show isort diff - run: | - isort ./weldx/*.py --diff - - name: run isort - run: | - isort ./weldx/*.py -c - black: runs-on: ubuntu-latest steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b0d7795d1..51e2ade51 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,13 @@ -default_language_version: - python: python3.8 +ci: + autofix_commit_msg: | + [pre-commit.ci] auto fixes from pre-commit.com hooks + + for more information, see https://pre-commit.ci + autofix_prs: false + autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate' + autoupdate_schedule: weekly + skip: [] + submodules: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.0.1 diff --git a/README.md b/README.md index 7c86eef0d..427d2d814 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,7 @@ This research is funded by the Federal Ministry of Education and Research of Ger ### Code Status [![static analysis](https://github.com/BAMWelDX/weldx/workflows/static%20analysis/badge.svg?branch=master)](https://github.com/BAMWelDX/weldx/actions?query=workflow%3A%22static+analysis%22+branch%3Amaster) +[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/BAMWelDX/weldx/master.svg)](https://results.pre-commit.ci/latest/github/BAMWelDX/weldx/master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5e7ede6d978249a781e5c580ed1c813f)](https://www.codacy.com/gh/BAMWelDX/weldx?utm_source=github.com&utm_medium=referral&utm_content=BAMWelDX/weldx&utm_campaign=Badge_Grade) [![codecov](https://codecov.io/gh/BAMWelDX/weldx/branch/master/graph/badge.svg)](https://codecov.io/gh/BAMWelDX/weldx) [![DeepSource](https://static.deepsource.io/deepsource-badge-light-mini.svg)](https://deepsource.io/gh/BAMWelDX/weldx/?ref=repository-badge) From 5e9e6d7e0c291c230d9b19eef74880d5fbaa4c32 Mon Sep 17 00:00:00 2001 From: vhirtham Date: Fri, 17 Sep 2021 12:24:42 +0200 Subject: [PATCH 3/4] Remove test case interdependency (#525) --- .github/workflows/pytest.yml | 4 +- .../tests/transformations/test_cs_manager.py | 86 +++++++++---------- 2 files changed, 42 insertions(+), 48 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index b16801bce..93205e423 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -70,7 +70,7 @@ jobs: - name: run pytest if: ((matrix.os == 'ubuntu-latest') && (matrix.py == '3.8')) || (github.event.pull_request.draft == false) || (github.ref == 'refs/heads/master') run: | - pytest -n 2 --runslow --dist=loadfile + pytest -n 2 --runslow echo "Exited with '$?'" - name: run pytest on notebooks (append coverage) @@ -82,7 +82,7 @@ jobs: - name: test with WeldxFile if: (matrix.os == 'ubuntu-latest') && (matrix.py == '3.8') run: | - pytest -n2 --dist loadfile --weldx-file-rw-buffer --weldx-file-rw-buffer-disp-header --cov-append ./weldx/tests/asdf_tests + pytest -n 2 --weldx-file-rw-buffer --weldx-file-rw-buffer-disp-header --cov-append ./weldx/tests/asdf_tests - name: coverage xml (combination is performed by pytest-cov) if: (matrix.os == 'ubuntu-latest') && (matrix.py == '3.8') diff --git a/weldx/tests/transformations/test_cs_manager.py b/weldx/tests/transformations/test_cs_manager.py index 00ece64e0..f6cc646de 100644 --- a/weldx/tests/transformations/test_cs_manager.py +++ b/weldx/tests/transformations/test_cs_manager.py @@ -88,56 +88,50 @@ def test_init(): CSM({}) -# test_add_coordinate_system ------------------------------------------------------- +# test_add_cs -------------------------------------------------------------------------- -# todo -# add time dependent systems. The problem is, that currently something messes -# up the comparison. The commented version of lcs_2 somehow switches the order of -# how 2 coordinates are stored in the Dataset. This lets the coordinate comparison -# fail. -csm_acs = CSM("root") -time = pd.DatetimeIndex(["2000-01-01", "2000-01-04"]) -# lcs_2_acs = LCS(coordinates=[[0, -1, -2], [8, 2, 7]], time=time) - -@pytest.mark.parametrize( - "name , parent, lcs, child_in_parent, exp_num_cs", - [ - ("lcs1", "root", LCS(coordinates=[0, 1, 2]), True, 2), - ("lcs2", "root", LCS(coordinates=[0, -1, -2]), False, 3), - ("lcs3", "lcs2", LCS(r_mat_y(1 / 2), [1, 2, 3]), True, 4), - ("lcs3", "lcs2", LCS(coordinates=[-1, -2, -3]), True, 4), - ("lcs2", "lcs3", LCS(coordinates=[-1, -2, -3]), False, 4), - ("lcs2", "lcs3", LCS(coordinates=[-1, -2, -3]), True, 4), - ("lcs4", "lcs2", LCS(coordinates=[0, 1, 2]), True, 5), - ("lcs4", "lcs2", LCS(r_mat_y(1 / 2), [1, 2, 3]), True, 5), - ("lcs5", "lcs1", LCS(r_mat_y(3 / 2), [2, 3, 1]), True, 6), - ( - "lcs5", - "lcs1", - LCS( - None, - TimeSeries(MathematicalExpression("a*t", dict(a=Q_(1, "1/s")))), - ), - True, - 6, - ), - ], -) -def test_add_coordinate_system(name, parent, lcs, child_in_parent, exp_num_cs): +def test_add_cs(): """Test the 'add_cs' function.""" - csm = csm_acs - csm.add_cs(name, parent, lcs, child_in_parent) - + csm = CSM("r") + ts = TimeSeries(MathematicalExpression("a*t", dict(a=Q_("1/s")))) + + lcs_data = [ + ("a", "r", LCS(coordinates=[0, 1, 2]), True), + ("b", "r", LCS(coordinates=[0, -1, -2]), False), + ("b", "r", LCS(coordinates=[[0, -1, -2], [8, 2, 7]], time=["1s", "2s"]), False), + ("c", "b", LCS(r_mat_y(1 / 2), [1, 2, 3]), True), + ("c", "b", LCS(coordinates=[-1, -2, -3]), True), + ("b", "c", LCS(coordinates=[-1, -2, -3]), False), + ("b", "c", LCS(coordinates=[-1, -2, -3]), True), + ("d", "b", LCS(coordinates=[0, 1, 2]), True), + ("d", "b", LCS(r_mat_y(1 / 2), [1, 2, 3]), True), + ("e", "a", LCS(r_mat_y(3 / 2), [2, 3, 1]), True), + ("e", "a", LCS(coordinates=ts), True), + ] + exp_num_cs = 1 assert csm.number_of_coordinate_systems == exp_num_cs - if child_in_parent: - assert csm.get_cs(name, parent) == lcs - if not isinstance(lcs.coordinates, TimeSeries): - assert csm.get_cs(parent, name) == lcs.invert() - else: - if not isinstance(lcs.coordinates, TimeSeries): - assert csm.get_cs(name, parent) == lcs.invert() - assert csm.get_cs(parent, name) == lcs + + for i, d in enumerate(lcs_data): + name = d[0] + parent = d[1] + lcs = d[2] + child_in_parent = d[3] + + if name not in csm.coordinate_system_names: + exp_num_cs += 1 + + csm.add_cs(name, parent, lcs, child_in_parent) + + assert csm.number_of_coordinate_systems == exp_num_cs, f"Testcase {i} failed" + if child_in_parent: + assert csm.get_cs(name, parent) == lcs, f"Testcase {i} failed" + if not isinstance(lcs.coordinates, TimeSeries): + assert csm.get_cs(parent, name) == lcs.invert(), f"Testcase {i} failed" + else: + if not isinstance(lcs.coordinates, TimeSeries): + assert csm.get_cs(name, parent) == lcs.invert(), f"Testcase {i} failed" + assert csm.get_cs(parent, name) == lcs, f"Testcase {i} failed" # test_add_cs_reference_time ----------------------------------------------------------- From 70656121bba179c0b9de63b63ed8a0cd72560f19 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 17 Sep 2021 12:55:14 +0200 Subject: [PATCH 4/4] change weldx schema versions to `0.1.0` (#535) * rename and update schemas * update python files * update manifest uri * update schemas * match GMAW process tag against pattern * update schema name * fix softare in examples * update schema versions in doc * update CHANGELOG.md * update CHANGELOG.md * lint * fix action name * ignore CSM warning in test_unmerge_merged_serially --- CHANGELOG.md | 11 +- devtools/scripts/update_manifest.py | 2 +- doc/schemas/aws.rst | 6 +- doc/schemas/core.rst | 14 +- doc/schemas/generic.rst | 2 +- doc/schemas/groove.rst | 2 +- doc/schemas/process.rst | 6 +- tutorials/weldxfile.ipynb | 2 +- weldx/asdf/_extension.py | 2 +- weldx/asdf/cli/welding_schema.py | 2 +- weldx/asdf/constants.py | 2 +- weldx/asdf/types.py | 5 +- weldx/asdf/util.py | 2 +- .../{weldx-1.0.0.yaml => weldx-0.1.0.yaml} | 240 +++++++++--------- ...metal-1.0.0.yaml => base_metal-0.1.0.yaml} | 4 +- ...ction-1.0.0.yaml => connection-0.1.0.yaml} | 6 +- ....0.0.yaml => joint_penetration-0.1.0.yaml} | 4 +- ...bly-1.0.0.yaml => sub_assembly-0.1.0.yaml} | 6 +- ...ils-1.0.0.yaml => weld_details-0.1.0.yaml} | 6 +- ...eldment-1.0.0.yaml => weldment-0.1.0.yaml} | 4 +- ...kpiece-1.0.0.yaml => workpiece-0.1.0.yaml} | 2 +- ....0.yaml => arc_welding_process-0.1.0.yaml} | 2 +- ...nt-1.0.0.yaml => gas_component-0.1.0.yaml} | 6 +- ...=> shielding_gas_for_procedure-0.1.0.yaml} | 22 +- ...0.0.yaml => shielding_gas_type-0.1.0.yaml} | 10 +- ...array-1.0.0.yaml => data_array-0.1.0.yaml} | 6 +- ...{dataset-1.0.0.yaml => dataset-0.1.0.yaml} | 8 +- ...ension-1.0.0.yaml => dimension-0.1.0.yaml} | 2 +- .../core/{file-1.0.0.yaml => file-0.1.0.yaml} | 12 +- ...ata-1.0.0.yaml => spatial_data-0.1.0.yaml} | 4 +- ...{di_edge-1.0.0.yaml => di_edge-0.1.0.yaml} | 12 +- ...i_graph-1.0.0.yaml => di_graph-0.1.0.yaml} | 24 +- ...{di_node-1.0.0.yaml => di_node-0.1.0.yaml} | 16 +- ...aml => mathematical_expression-0.1.0.yaml} | 6 +- ...ries-1.0.0.yaml => time_series-0.1.0.yaml} | 12 +- ...=> coordinate_system_hierarchy-0.1.0.yaml} | 54 ++-- ...aml => local_coordinate_system-0.1.0.yaml} | 48 ++-- ...otation-1.0.0.yaml => rotation-0.1.0.yaml} | 12 +- ...ariable-1.0.0.yaml => variable-0.1.0.yaml} | 2 +- ...1.0.0.yaml => single_pass_weld-0.1.0.yaml} | 214 ++++++++-------- ....0.0.yaml => test_property_tag-0.1.0.yaml} | 4 +- ...0.yaml => test_shape_validator-0.1.0.yaml} | 10 +- ....0.yaml => test_unit_validator-0.1.0.yaml} | 12 +- ....yaml => measurement_equipment-0.1.0.yaml} | 14 +- ...Groove-1.0.0.yaml => DHUGroove-0.1.0.yaml} | 22 +- ...Groove-1.0.0.yaml => DHVGroove-0.1.0.yaml} | 18 +- ...UGroove-1.0.0.yaml => DUGroove-0.1.0.yaml} | 22 +- ...VGroove-1.0.0.yaml => DVGroove-0.1.0.yaml} | 18 +- ...FGroove-1.0.0.yaml => FFGroove-0.1.0.yaml} | 24 +- ...UGroove-1.0.0.yaml => HUGroove-0.1.0.yaml} | 14 +- ...VGroove-1.0.0.yaml => HVGroove-0.1.0.yaml} | 12 +- ...{IGroove-1.0.0.yaml => IGroove-0.1.0.yaml} | 8 +- ...{UGroove-1.0.0.yaml => UGroove-0.1.0.yaml} | 14 +- ...VGroove-1.0.0.yaml => UVGroove-0.1.0.yaml} | 16 +- ...{VGroove-1.0.0.yaml => VGroove-0.1.0.yaml} | 12 +- ...VGroove-1.0.0.yaml => VVGroove-0.1.0.yaml} | 16 +- .../{terms-1.0.0.yaml => terms-0.1.0.yaml} | 16 +- .../{error-1.0.0.yaml => error-0.1.0.yaml} | 6 +- ...ment-1.0.0.yaml => measurement-0.1.0.yaml} | 6 +- ....0.0.yaml => measurement_chain-0.1.0.yaml} | 54 ++-- .../{signal-1.0.0.yaml => signal-0.1.0.yaml} | 8 +- ....yaml => signal_transformation-0.1.0.yaml} | 16 +- .../{source-1.0.0.yaml => source-0.1.0.yaml} | 12 +- .../{pulse-1.0.0.yaml => pulse-0.1.0.yaml} | 8 +- ...ay_arc-1.0.0.yaml => spray_arc-0.1.0.yaml} | 8 +- .../{GMAW-1.0.0.yaml => GMAW-0.1.0.yaml} | 36 +-- .../weldx/process/generic-0.1.0.yaml | 13 + .../weldx/process/generic-1.0.0.yaml | 13 - .../{terms-1.0.0.yaml => terms-0.1.0.yaml} | 20 +- ...ex-1.0.0.yaml => datetimeindex-0.1.0.yaml} | 20 +- .../time/{time-1.0.0.yaml => time-0.1.0.yaml} | 46 ++-- ...edelta-1.0.0.yaml => timedelta-0.1.0.yaml} | 4 +- ...x-1.0.0.yaml => timedeltaindex-0.1.0.yaml} | 30 +-- ...estamp-1.0.0.yaml => timestamp-0.1.0.yaml} | 8 +- ...ension-1.0.0.yaml => dimension-0.1.0.yaml} | 2 +- ...uantity-1.0.0.yaml => quantity-0.1.0.yaml} | 16 +- .../unit/{unit-1.0.0.yaml => unit-0.1.0.yaml} | 6 +- .../{uuid-1.0.0.yaml => uuid-0.1.0.yaml} | 6 +- weldx/tags/aws/design/base_metal.py | 2 +- weldx/tags/aws/design/connection.py | 2 +- weldx/tags/aws/design/joint_penetration.py | 2 +- weldx/tags/aws/design/sub_assembly.py | 2 +- weldx/tags/aws/design/weld_details.py | 2 +- weldx/tags/aws/design/weldment.py | 2 +- weldx/tags/aws/design/workpiece.py | 2 +- weldx/tags/aws/process/arc_welding_process.py | 2 +- weldx/tags/aws/process/gas_component.py | 2 +- .../process/shielding_gas_for_procedure.py | 2 +- weldx/tags/aws/process/shielding_gas_type.py | 2 +- weldx/tags/base_types.py | 2 +- weldx/tags/core/common_types.py | 4 +- weldx/tags/core/data_array.py | 2 +- weldx/tags/core/dataset.py | 2 +- weldx/tags/core/file.py | 2 +- weldx/tags/core/geometry/spatial_data.py | 2 +- weldx/tags/core/graph.py | 6 +- weldx/tags/core/mathematical_expression.py | 2 +- weldx/tags/core/time_series.py | 2 +- .../_legacy/coordinate_system_hierarchy.py | 6 +- .../coordinate_system_hierarchy.py | 2 +- .../local_coordinate_system.py | 2 +- weldx/tags/core/transformations/rotation.py | 2 +- weldx/tags/debug/test_property_tag.py | 2 +- weldx/tags/debug/test_shape_validator.py | 2 +- weldx/tags/debug/test_unit_validator.py | 2 +- weldx/tags/equipment/measurement_equipment.py | 2 +- weldx/tags/groove/iso_9692_1.py | 2 +- weldx/tags/measurement/error.py | 2 +- weldx/tags/measurement/measurement.py | 2 +- weldx/tags/measurement/measurement_chain.py | 2 +- weldx/tags/measurement/signal.py | 2 +- .../tags/measurement/signal_transformation.py | 2 +- weldx/tags/measurement/source.py | 2 +- weldx/tags/processes/process.py | 11 +- weldx/tags/time/datetimeindex.py | 2 +- weldx/tags/time/time.py | 2 +- weldx/tags/time/timedelta.py | 2 +- weldx/tags/time/timedeltaindex.py | 2 +- weldx/tags/time/timestamp.py | 2 +- weldx/tags/unit/pint_quantity.py | 4 +- weldx/tests/asdf_tests/test_asdf_util.py | 6 +- weldx/tests/asdf_tests/test_weldx_file.py | 10 +- .../tests/transformations/test_cs_manager.py | 1 + 123 files changed, 758 insertions(+), 756 deletions(-) rename weldx/manifests/{weldx-1.0.0.yaml => weldx-0.1.0.yaml} (76%) rename weldx/schemas/weldx.bam.de/weldx/aws/design/{base_metal-1.0.0.yaml => base_metal-0.1.0.yaml} (95%) rename weldx/schemas/weldx.bam.de/weldx/aws/design/{connection-1.0.0.yaml => connection-0.1.0.yaml} (92%) rename weldx/schemas/weldx.bam.de/weldx/aws/design/{joint_penetration-1.0.0.yaml => joint_penetration-0.1.0.yaml} (95%) rename weldx/schemas/weldx.bam.de/weldx/aws/design/{sub_assembly-1.0.0.yaml => sub_assembly-0.1.0.yaml} (83%) rename weldx/schemas/weldx.bam.de/weldx/aws/design/{weld_details-1.0.0.yaml => weld_details-0.1.0.yaml} (82%) rename weldx/schemas/weldx.bam.de/weldx/aws/design/{weldment-1.0.0.yaml => weldment-0.1.0.yaml} (80%) rename weldx/schemas/weldx.bam.de/weldx/aws/design/{workpiece-1.0.0.yaml => workpiece-0.1.0.yaml} (90%) rename weldx/schemas/weldx.bam.de/weldx/aws/process/{arc_welding_process-1.0.0.yaml => arc_welding_process-0.1.0.yaml} (98%) rename weldx/schemas/weldx.bam.de/weldx/aws/process/{gas_component-1.0.0.yaml => gas_component-0.1.0.yaml} (92%) rename weldx/schemas/weldx.bam.de/weldx/aws/process/{shielding_gas_for_procedure-1.0.0.yaml => shielding_gas_for_procedure-0.1.0.yaml} (86%) rename weldx/schemas/weldx.bam.de/weldx/aws/process/{shielding_gas_type-1.0.0.yaml => shielding_gas_type-0.1.0.yaml} (93%) rename weldx/schemas/weldx.bam.de/weldx/core/{data_array-1.0.0.yaml => data_array-0.1.0.yaml} (80%) rename weldx/schemas/weldx.bam.de/weldx/core/{dataset-1.0.0.yaml => dataset-0.1.0.yaml} (79%) rename weldx/schemas/weldx.bam.de/weldx/core/{dimension-1.0.0.yaml => dimension-0.1.0.yaml} (90%) rename weldx/schemas/weldx.bam.de/weldx/core/{file-1.0.0.yaml => file-0.1.0.yaml} (86%) rename weldx/schemas/weldx.bam.de/weldx/core/geometry/{spatial_data-1.0.0.yaml => spatial_data-0.1.0.yaml} (98%) rename weldx/schemas/weldx.bam.de/weldx/core/graph/{di_edge-1.0.0.yaml => di_edge-0.1.0.yaml} (69%) rename weldx/schemas/weldx.bam.de/weldx/core/graph/{di_graph-1.0.0.yaml => di_graph-0.1.0.yaml} (83%) rename weldx/schemas/weldx.bam.de/weldx/core/graph/{di_node-1.0.0.yaml => di_node-0.1.0.yaml} (59%) rename weldx/schemas/weldx.bam.de/weldx/core/{mathematical_expression-1.0.0.yaml => mathematical_expression-0.1.0.yaml} (97%) rename weldx/schemas/weldx.bam.de/weldx/core/{time_series-1.0.0.yaml => time_series-0.1.0.yaml} (92%) rename weldx/schemas/weldx.bam.de/weldx/core/transformations/{coordinate_system_hierarchy-1.0.0.yaml => coordinate_system_hierarchy-0.1.0.yaml} (87%) rename weldx/schemas/weldx.bam.de/weldx/core/transformations/{local_coordinate_system-1.0.0.yaml => local_coordinate_system-0.1.0.yaml} (76%) rename weldx/schemas/weldx.bam.de/weldx/core/transformations/{rotation-1.0.0.yaml => rotation-0.1.0.yaml} (95%) rename weldx/schemas/weldx.bam.de/weldx/core/{variable-1.0.0.yaml => variable-0.1.0.yaml} (95%) rename weldx/schemas/weldx.bam.de/weldx/datamodels/{single_pass_weld-1.0.0.yaml => single_pass_weld-0.1.0.yaml} (88%) rename weldx/schemas/weldx.bam.de/weldx/debug/{test_property_tag-1.0.0.yaml => test_property_tag-0.1.0.yaml} (86%) rename weldx/schemas/weldx.bam.de/weldx/debug/{test_shape_validator-1.0.0.yaml => test_shape_validator-0.1.0.yaml} (91%) rename weldx/schemas/weldx.bam.de/weldx/debug/{test_unit_validator-1.0.0.yaml => test_unit_validator-0.1.0.yaml} (81%) rename weldx/schemas/weldx.bam.de/weldx/equipment/{measurement_equipment-1.0.0.yaml => measurement_equipment-0.1.0.yaml} (89%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{DHUGroove-1.0.0.yaml => DHUGroove-0.1.0.yaml} (67%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{DHVGroove-1.0.0.yaml => DHVGroove-0.1.0.yaml} (69%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{DUGroove-1.0.0.yaml => DUGroove-0.1.0.yaml} (67%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{DVGroove-1.0.0.yaml => DVGroove-0.1.0.yaml} (70%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{FFGroove-1.0.0.yaml => FFGroove-0.1.0.yaml} (85%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{HUGroove-1.0.0.yaml => HUGroove-0.1.0.yaml} (71%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{HVGroove-1.0.0.yaml => HVGroove-0.1.0.yaml} (73%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{IGroove-1.0.0.yaml => IGroove-0.1.0.yaml} (78%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{UGroove-1.0.0.yaml => UGroove-0.1.0.yaml} (71%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{UVGroove-1.0.0.yaml => UVGroove-0.1.0.yaml} (70%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{VGroove-1.0.0.yaml => VGroove-0.1.0.yaml} (78%) rename weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/{VVGroove-1.0.0.yaml => VVGroove-0.1.0.yaml} (70%) rename weldx/schemas/weldx.bam.de/weldx/groove/{terms-1.0.0.yaml => terms-0.1.0.yaml} (72%) rename weldx/schemas/weldx.bam.de/weldx/measurement/{error-1.0.0.yaml => error-0.1.0.yaml} (74%) rename weldx/schemas/weldx.bam.de/weldx/measurement/{measurement-1.0.0.yaml => measurement-0.1.0.yaml} (71%) rename weldx/schemas/weldx.bam.de/weldx/measurement/{measurement_chain-1.0.0.yaml => measurement_chain-0.1.0.yaml} (90%) rename weldx/schemas/weldx.bam.de/weldx/measurement/{signal-1.0.0.yaml => signal-0.1.0.yaml} (76%) rename weldx/schemas/weldx.bam.de/weldx/measurement/{signal_transformation-1.0.0.yaml => signal_transformation-0.1.0.yaml} (93%) rename weldx/schemas/weldx.bam.de/weldx/measurement/{source-1.0.0.yaml => source-0.1.0.yaml} (74%) rename weldx/schemas/weldx.bam.de/weldx/process/CLOOS/{pulse-1.0.0.yaml => pulse-0.1.0.yaml} (53%) rename weldx/schemas/weldx.bam.de/weldx/process/CLOOS/{spray_arc-1.0.0.yaml => spray_arc-0.1.0.yaml} (79%) rename weldx/schemas/weldx.bam.de/weldx/process/{GMAW-1.0.0.yaml => GMAW-0.1.0.yaml} (81%) create mode 100644 weldx/schemas/weldx.bam.de/weldx/process/generic-0.1.0.yaml delete mode 100644 weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml rename weldx/schemas/weldx.bam.de/weldx/process/{terms-1.0.0.yaml => terms-0.1.0.yaml} (84%) rename weldx/schemas/weldx.bam.de/weldx/time/{datetimeindex-1.0.0.yaml => datetimeindex-0.1.0.yaml} (77%) rename weldx/schemas/weldx.bam.de/weldx/time/{time-1.0.0.yaml => time-0.1.0.yaml} (58%) rename weldx/schemas/weldx.bam.de/weldx/time/{timedelta-1.0.0.yaml => timedelta-0.1.0.yaml} (77%) rename weldx/schemas/weldx.bam.de/weldx/time/{timedeltaindex-1.0.0.yaml => timedeltaindex-0.1.0.yaml} (71%) rename weldx/schemas/weldx.bam.de/weldx/time/{timestamp-1.0.0.yaml => timestamp-0.1.0.yaml} (82%) rename weldx/schemas/weldx.bam.de/weldx/unit/{dimension-1.0.0.yaml => dimension-0.1.0.yaml} (95%) rename weldx/schemas/weldx.bam.de/weldx/unit/{quantity-1.0.0.yaml => quantity-0.1.0.yaml} (65%) rename weldx/schemas/weldx.bam.de/weldx/unit/{unit-1.0.0.yaml => unit-0.1.0.yaml} (50%) rename weldx/schemas/weldx.bam.de/weldx/{uuid-1.0.0.yaml => uuid-0.1.0.yaml} (68%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09309c069..2ee38c5e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ ### ASDF +- all schema version numbers set to ``0.1.0`` [[#535]](https://github.com/BAMWelDX/weldx/pull/535). - add ``time/time`` schema to support `Time` class [[#463]](https://github.com/BAMWelDX/weldx/pull/463). - rework ASDF extension to new asdf 2.8 API [[#467]](https://github.com/BAMWelDX/weldx/pull/467) - move schema files to ``weldx/schemas`` @@ -79,9 +80,9 @@ - move tag module to ``weldx/tags`` - refactor all asdf uris to new ``asdf://`` naming convention, see https://asdf.readthedocs.io/en/latest/asdf/extending/uris.html#entities-identified-by-uri - - replaced all referenced weldx tag versions in schemas with ``1.*`` + - replaced all referenced weldx tag versions in schemas with ``0.1.*`` - refactor ``asdf://weldx.bam.de/weldx/schemas/datamodels/single_pass_weld-1.0.0.schema`` - to ``asdf://weldx.bam.de/weldx/schemas/datamodels/single_pass_weld-1.0.0`` and enable schema test + to ``asdf://weldx.bam.de/weldx/schemas/datamodels/single_pass_weld-0.1.0`` and enable schema test - add legacy class for validators support in ``weldx.asdf._extension.py`` - asdf utility functions `weldx.asdf.util.uri_match`, `weldx.asdf.util.get_converter_for_tag` and `weldx.asdf.util.get_weldx_extension` @@ -89,11 +90,11 @@ - custom shape validation must now be implemented via staticmethod ``WeldxConverter.shape_from_tagged`` - provide legacy schema support in ``weldx/schemas/weldx.bam.de/legacy`` [[#533]](https://github.com/BAMWelDX/weldx/pull/533) -- rewrote `asdf://weldx.bam.de/weldx/schemas/core/transformations/coordinate_system_hierarchy-1.0.0` schema for +- rewrote `asdf://weldx.bam.de/weldx/schemas/core/transformations/coordinate_system_hierarchy` schema for the `CoordinateSystemManager`. It uses the digraph schemas to serialize the coordinate system structure. [[#497]](https://github.com/BAMWelDX/weldx/pull/497) -- add ``asdf://weldx.bam.de/weldx/schemas/unit/quantity-1.0.0`` - and ``asdf://weldx.bam.de/weldx/schemas/unit/unit-1.0.0`` schemas [[#522]](https://github.com/BAMWelDX/weldx/pull/522) +- add ``asdf://weldx.bam.de/weldx/schemas/unit/quantity`` + and ``asdf://weldx.bam.de/weldx/schemas/unit/unit`` schemas [[#522]](https://github.com/BAMWelDX/weldx/pull/522) ### deprecations diff --git a/devtools/scripts/update_manifest.py b/devtools/scripts/update_manifest.py index 2eeaf9a4e..e765ef474 100644 --- a/devtools/scripts/update_manifest.py +++ b/devtools/scripts/update_manifest.py @@ -7,7 +7,7 @@ def update_manifest( search_dir: str = "../../weldx/schemas", - out: str = "../../weldx/manifests/weldx-1.0.0.yaml", + out: str = "../../weldx/manifests/weldx-0.1.0.yaml", ): """Create manifest file from existing schemas.""" # read existing manifest diff --git a/doc/schemas/aws.rst b/doc/schemas/aws.rst index 71dee7de1..793d580b9 100644 --- a/doc/schemas/aws.rst +++ b/doc/schemas/aws.rst @@ -5,6 +5,6 @@ The ``AWS`` directory contains example implementations for shielding gas descrip .. asdf-autoschemas:: - aws/process/shielding_gas_for_procedure-1.0.0 - aws/process/shielding_gas_type-1.0.0 - aws/process/gas_component-1.0.0 + aws/process/shielding_gas_for_procedure-0.1.0 + aws/process/shielding_gas_type-0.1.0 + aws/process/gas_component-0.1.0 diff --git a/doc/schemas/core.rst b/doc/schemas/core.rst index ab611321b..df9d57386 100644 --- a/doc/schemas/core.rst +++ b/doc/schemas/core.rst @@ -5,13 +5,13 @@ The ``core`` directory contains schema implementations for the base classes. .. asdf-autoschemas:: - core/mathematical_expression-1.0.0 - core/time_series-1.0.0 - core/variable-1.0.0 - core/dimension-1.0.0 - core/data_array-1.0.0 - core/dataset-1.0.0 - core/file-1.0.0 + core/mathematical_expression-0.1.0 + core/time_series-0.1.0 + core/variable-0.1.0 + core/dimension-0.1.0 + core/data_array-0.1.0 + core/dataset-0.1.0 + core/file-0.1.0 Transformations =============== diff --git a/doc/schemas/generic.rst b/doc/schemas/generic.rst index d8b9efc33..c18a267f6 100644 --- a/doc/schemas/generic.rst +++ b/doc/schemas/generic.rst @@ -5,4 +5,4 @@ The ``generic`` directory contains basic schemas. .. asdf-autoschemas:: - uuid-1.0.0 + uuid-0.1.0 diff --git a/doc/schemas/groove.rst b/doc/schemas/groove.rst index efe2ba5e0..cd66cc8c3 100644 --- a/doc/schemas/groove.rst +++ b/doc/schemas/groove.rst @@ -8,7 +8,7 @@ Common Terms .. asdf-autoschemas:: - groove/terms-1.0.0 + groove/terms-0.1.0 DIN EN ISO 9692-1 ################# diff --git a/doc/schemas/process.rst b/doc/schemas/process.rst index 628529569..d2ab68e73 100644 --- a/doc/schemas/process.rst +++ b/doc/schemas/process.rst @@ -5,6 +5,6 @@ The ``Process`` directory contains schema implementations for the base classes. .. asdf-autoschemas:: - process/generic-1.0.0 - process/GMAW-1.0.0 - process/terms-1.0.0 + process/generic-0.1.0 + process/GMAW-0.1.0 + process/terms-0.1.0 diff --git a/tutorials/weldxfile.ipynb b/tutorials/weldxfile.ipynb index 9d907d20e..469ed12d1 100644 --- a/tutorials/weldxfile.ipynb +++ b/tutorials/weldxfile.ipynb @@ -389,7 +389,7 @@ "metadata": {}, "outputs": [], "source": [ - "schema = get_schema_path(\"single_pass_weld-1.0.0\")\n", + "schema = get_schema_path(\"single_pass_weld-0.1.0\")\n", "schema" ] }, diff --git a/weldx/asdf/_extension.py b/weldx/asdf/_extension.py index b5cc9d7eb..bd56ec870 100644 --- a/weldx/asdf/_extension.py +++ b/weldx/asdf/_extension.py @@ -21,7 +21,7 @@ class WeldxLegacyValidatorType(CustomType): organization = "weldx.bam.de" standard = "weldx" name = "legacy/validators" - version = "1.0.0" + version = "0.1.0" types = [] validators = { "wx_property_tag": wx_property_tag_validator, diff --git a/weldx/asdf/cli/welding_schema.py b/weldx/asdf/cli/welding_schema.py index d64d386dd..0fcf863ad 100644 --- a/weldx/asdf/cli/welding_schema.py +++ b/weldx/asdf/cli/welding_schema.py @@ -292,7 +292,7 @@ def single_pass_weld_example( wx_metadata={"welder": "A.W. Elder"}, ) - model_path = get_schema_path("single_pass_weld-1.0.0.yaml") + model_path = get_schema_path("single_pass_weld-0.1.0.yaml") # pre-validate? weldx.asdf.util.write_read_buffer( diff --git a/weldx/asdf/constants.py b/weldx/asdf/constants.py index 95c86f38c..0c260ec3a 100644 --- a/weldx/asdf/constants.py +++ b/weldx/asdf/constants.py @@ -9,5 +9,5 @@ WELDX_SCHEMA_URI_BASE = "asdf://weldx.bam.de/weldx/schemas/" WELDX_EXTENSION_URI_BASE = "asdf://weldx.bam.de/weldx/extensions/" -WELDX_EXTENSION_VERSION = "1.0.0" +WELDX_EXTENSION_VERSION = "0.1.0" WELDX_EXTENSION_URI = f"{WELDX_EXTENSION_URI_BASE}weldx-{WELDX_EXTENSION_VERSION}" diff --git a/weldx/asdf/types.py b/weldx/asdf/types.py index 582b51dfd..1d97850d5 100644 --- a/weldx/asdf/types.py +++ b/weldx/asdf/types.py @@ -18,7 +18,7 @@ "WxSyntaxError", ] -_new_tag_regex = re.compile(r"asdf://weldx.bam.de/weldx/tags/(.*)-(\d+.\d+.\d+|1.\*)") +_new_tag_regex = re.compile(r"asdf://weldx.bam.de/weldx/tags/(.*)-(\d+.\d+.\d+|0.1.\*)") class WxSyntaxError(Exception): @@ -81,7 +81,7 @@ def __new__(mcs, name, bases, attrs): setattr( cls, "tags", - [format_tag(name, "1.*")], + [format_tag(name, "0.1.*")], ) # wrap original to/from_yaml_tree method to include metadata attributes @@ -127,4 +127,5 @@ def format_tag(tag_name, version=None, organization="weldx.bam.de", standard="we def _legacy_tag_from_new_tag(tag: str): name, version = _new_tag_regex.search(tag).groups() + version = "1.0.0" # legacy_tag version return f"tag:weldx.bam.de:weldx/{name}-{version}" diff --git a/weldx/asdf/util.py b/weldx/asdf/util.py index e6e75aaed..659cc36f2 100644 --- a/weldx/asdf/util.py +++ b/weldx/asdf/util.py @@ -503,7 +503,7 @@ def get_highest_tag_version( -------- >>> from weldx.asdf.util import get_highest_tag_version >>> get_highest_tag_version("asdf://weldx.bam.de/weldx/tags/uuid-*") - 'asdf://weldx.bam.de/weldx/tags/uuid-1.0.0' + 'asdf://weldx.bam.de/weldx/tags/uuid-0.1.0' """ if ctx is None: diff --git a/weldx/manifests/weldx-1.0.0.yaml b/weldx/manifests/weldx-0.1.0.yaml similarity index 76% rename from weldx/manifests/weldx-1.0.0.yaml rename to weldx/manifests/weldx-0.1.0.yaml index 2e5d6d7b8..4222954b6 100644 --- a/weldx/manifests/weldx-1.0.0.yaml +++ b/weldx/manifests/weldx-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- -id: asdf://weldx.bam.de/weldx/manifests/weldx-1.0.0 -extension_uri: asdf://weldx.bam.de/weldx/extensions/weldx-1.0.0 +id: asdf://weldx.bam.de/weldx/manifests/weldx-0.1.0 +extension_uri: asdf://weldx.bam.de/weldx/extensions/weldx-0.1.0 title: weldx extension manifest for tag mapping description: Manifest listing all tag URIs with schema URIs supported by weldx tags: @@ -55,10 +55,6 @@ tags: schema_uri: http://weldx.bam.de/schemas/weldx/core/graph/di_node-1.0.0 - tag_uri: tag:weldx.bam.de:weldx/core/transformations/coordinate_system_hierarchy-1.0.0 schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/coordinate_system_hierarchy-1.0.0 -- tag_uri: tag:weldx.bam.de:weldx/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0 - schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0 -- tag_uri: tag:weldx.bam.de:weldx/core/transformations/coordinate_transformation-1.0.0 - schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/coordinate_transformation-1.0.0 - tag_uri: tag:weldx.bam.de:weldx/core/transformations/local_coordinate_system-1.0.0 schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/local_coordinate_system-1.0.0 - tag_uri: tag:weldx.bam.de:weldx/core/transformations/rotation-1.0.0 @@ -121,120 +117,120 @@ tags: schema_uri: http://weldx.bam.de/schemas/weldx/time/timedeltaindex-1.0.0 - tag_uri: tag:weldx.bam.de:weldx/time/timestamp-1.0.0 schema_uri: http://weldx.bam.de/schemas/weldx/time/timestamp-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/uuid-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/uuid-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/base_metal-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/base_metal-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/connection-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/connection-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/joint_penetration-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/joint_penetration-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/sub_assembly-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/sub_assembly-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/weldment-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/weldment-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/weld_details-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/weld_details-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/workpiece-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/workpiece-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/arc_welding_process-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/arc_welding_process-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/gas_component-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/gas_component-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/shielding_gas_for_procedure-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_for_procedure-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/shielding_gas_type-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_type-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/dataset-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/dataset-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/data_array-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/data_array-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/dimension-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/dimension-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/file-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/file-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/mathematical_expression-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/mathematical_expression-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/time_series-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/time_series-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/variable-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/variable-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/geometry/spatial_data-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/geometry/spatial_data-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/graph/di_edge-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/graph/di_graph-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/graph/di_graph-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/graph/di_node-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/graph/di_node-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/transformations/coordinate_system_hierarchy-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/transformations/coordinate_system_hierarchy-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/transformations/local_coordinate_system-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/transformations/local_coordinate_system-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/core/transformations/rotation-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/core/transformations/rotation-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/debug/test_property_tag-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/debug/test_property_tag-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/debug/test_shape_validator-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/debug/test_shape_validator-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/debug/test_unit_validator-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/debug/test_unit_validator-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/equipment/measurement_equipment-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DHUGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHUGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DHVGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHVGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DUGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DUGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DVGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DVGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/FFGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/FFGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/HUGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HUGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/HVGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HVGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/IGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/IGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/UGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/UVGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UVGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/VGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/VVGroove-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VVGroove-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/error-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/error-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/measurement-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/measurement-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/measurement_chain-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/measurement_chain-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/signal-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/signal-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/signal_transformation-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/signal_transformation-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/source-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/source-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/process/GMAW-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/process/GMAW-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/process/CLOOS/pulse-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/process/CLOOS/pulse-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/process/CLOOS/spray_arc-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/process/CLOOS/spray_arc-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/time/datetimeindex-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/time/datetimeindex-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/time/time-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/time/time-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/time/timedelta-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/time/timedelta-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/time/timedeltaindex-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/time/timestamp-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/time/timestamp-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/unit/quantity-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/unit/quantity-1.0.0 -- tag_uri: asdf://weldx.bam.de/weldx/tags/unit/unit-1.0.0 - schema_uri: asdf://weldx.bam.de/weldx/schemas/unit/unit-1.0.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/uuid-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/uuid-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/base_metal-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/base_metal-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/connection-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/connection-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/joint_penetration-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/joint_penetration-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/sub_assembly-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/sub_assembly-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/weldment-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/weldment-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/weld_details-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/weld_details-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/design/workpiece-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/design/workpiece-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/arc_welding_process-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/arc_welding_process-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/gas_component-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/gas_component-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/shielding_gas_for_procedure-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_for_procedure-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/aws/process/shielding_gas_type-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_type-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/dataset-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/dataset-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/data_array-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/data_array-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/dimension-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/dimension-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/file-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/file-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/mathematical_expression-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/mathematical_expression-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/time_series-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/variable-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/variable-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/geometry/spatial_data-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/geometry/spatial_data-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/graph/di_edge-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/graph/di_graph-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/graph/di_graph-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/graph/di_node-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/graph/di_node-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/transformations/coordinate_system_hierarchy-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/transformations/coordinate_system_hierarchy-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/transformations/local_coordinate_system-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/transformations/local_coordinate_system-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/core/transformations/rotation-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/core/transformations/rotation-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/debug/test_property_tag-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/debug/test_property_tag-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/debug/test_shape_validator-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/debug/test_shape_validator-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/debug/test_unit_validator-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/debug/test_unit_validator-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/equipment/measurement_equipment-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DHUGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHUGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DHVGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHVGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DUGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DUGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/DVGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DVGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/FFGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/FFGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/HUGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HUGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/HVGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HVGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/IGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/IGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/UGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/UVGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UVGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/VGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/VVGroove-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VVGroove-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/error-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/error-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/measurement-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/measurement-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/measurement_chain-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/measurement_chain-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/signal-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/signal-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/signal_transformation-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/signal_transformation-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/measurement/source-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/measurement/source-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/process/GMAW-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/process/GMAW-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/process/CLOOS/pulse-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/process/CLOOS/pulse-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/process/CLOOS/spray_arc-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/process/CLOOS/spray_arc-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/time/datetimeindex-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/time/datetimeindex-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/time/time-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/time/time-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/time/timedelta-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/time/timedelta-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/time/timedeltaindex-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/time/timestamp-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/unit/quantity-0.1.0 +- tag_uri: asdf://weldx.bam.de/weldx/tags/unit/unit-0.1.0 + schema_uri: asdf://weldx.bam.de/weldx/schemas/unit/unit-0.1.0 ... diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/design/base_metal-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/design/base_metal-0.1.0.yaml similarity index 95% rename from weldx/schemas/weldx.bam.de/weldx/aws/design/base_metal-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/design/base_metal-0.1.0.yaml index d82e7660e..51facbdb8 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/design/base_metal-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/design/base_metal-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/design/base_metal-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/design/base_metal-0.1.0" title: | @@ -33,7 +33,7 @@ properties: description: | Plate or sheet thickness, if tube, specifies wall thickness. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" diameter: diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/design/connection-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/design/connection-0.1.0.yaml similarity index 92% rename from weldx/schemas/weldx.bam.de/weldx/aws/design/connection-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/design/connection-0.1.0.yaml index 3529facde..d2d462245 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/design/connection-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/design/connection-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/design/connection-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/design/connection-0.1.0" title: | @@ -60,12 +60,12 @@ properties: joint_penetration: description: | joint_penetration - $ref: joint_penetration-1.0.0 + $ref: joint_penetration-0.1.0 weld_details: description: | weld_details - $ref: weld_details-1.0.0 + $ref: weld_details-0.1.0 diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/design/joint_penetration-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/design/joint_penetration-0.1.0.yaml similarity index 95% rename from weldx/schemas/weldx.bam.de/weldx/aws/design/joint_penetration-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/design/joint_penetration-0.1.0.yaml index da4c6417c..6282d48bd 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/design/joint_penetration-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/design/joint_penetration-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/design/joint_penetration-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/design/joint_penetration-0.1.0" title: | @@ -21,7 +21,7 @@ properties: description: | The distance the weld metal extends into the root joint oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" groove_weld_size: diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/design/sub_assembly-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/design/sub_assembly-0.1.0.yaml similarity index 83% rename from weldx/schemas/weldx.bam.de/weldx/aws/design/sub_assembly-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/design/sub_assembly-0.1.0.yaml index d4cac342a..858d6339e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/design/sub_assembly-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/design/sub_assembly-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/design/sub_assembly-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/design/sub_assembly-0.1.0" title: | @@ -14,12 +14,12 @@ properties: Describes a piece of metal, its materials and geometries. type: array items: - $ref: workpiece-1.0.0 + $ref: workpiece-0.1.0 connection: description: | The joint formed by edge preparation of two workpieces and the weld that joins the workpieces together. - $ref: connection-1.0.0 + $ref: connection-0.1.0 diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/design/weld_details-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/design/weld_details-0.1.0.yaml similarity index 82% rename from weldx/schemas/weldx.bam.de/weldx/aws/design/weld_details-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/design/weld_details-0.1.0.yaml index cd712b628..0d205d676 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/design/weld_details-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/design/weld_details-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/design/weld_details-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/design/weld_details-0.1.0" title: | @@ -12,13 +12,13 @@ properties: joint_design: description: | AWS 3.0, p. 19 : "Detailed Description of mating configuration of two components, sufficient information for shop preparation of the components." TODO CLASS - tag: "asdf://weldx.bam.de/weldx/tags/groove/**-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/groove/**-0.1.*" weld_sizes: description: | Linear dimensions of cross sectional weld features. Sizes are of design and actual features. TODO CLASS oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" number_of_passes: diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/design/weldment-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/design/weldment-0.1.0.yaml similarity index 80% rename from weldx/schemas/weldx.bam.de/weldx/aws/design/weldment-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/design/weldment-0.1.0.yaml index 4d3818809..f9fdc42cd 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/design/weldment-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/design/weldment-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/design/weldment-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/design/weldment-0.1.0" title: | @@ -14,7 +14,7 @@ properties: A list of assemblies composing the weldment type: array items: - $ref: sub_assembly-1.0.0 + $ref: sub_assembly-0.1.0 diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/design/workpiece-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/design/workpiece-0.1.0.yaml similarity index 90% rename from weldx/schemas/weldx.bam.de/weldx/aws/design/workpiece-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/design/workpiece-0.1.0.yaml index 3b98f3484..bb114ea53 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/design/workpiece-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/design/workpiece-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/design/workpiece-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/design/workpiece-0.1.0" title: | diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/process/arc_welding_process-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/process/arc_welding_process-0.1.0.yaml similarity index 98% rename from weldx/schemas/weldx.bam.de/weldx/aws/process/arc_welding_process-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/process/arc_welding_process-0.1.0.yaml index 4793c734f..18c4361b7 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/process/arc_welding_process-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/process/arc_welding_process-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/process/arc_welding_process-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/process/arc_welding_process-0.1.0" title: | diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/process/gas_component-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/process/gas_component-0.1.0.yaml similarity index 92% rename from weldx/schemas/weldx.bam.de/weldx/aws/process/gas_component-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/process/gas_component-0.1.0.yaml index 41bdc9fa3..20a2dfd22 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/process/gas_component-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/process/gas_component-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/process/gas_component-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/process/gas_component-0.1.0" title: | Shielding gas component @@ -12,7 +12,7 @@ examples: - - A single argon gas component - | - ! + ! gas_chemical_name: argon gas_percentage: !unit/quantity-1.1.0 {unit: percent, value: 82} @@ -33,7 +33,7 @@ properties: description: | Percentage by weight this gas occupies of the total gas mixture. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "percent" diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_for_procedure-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_for_procedure-0.1.0.yaml similarity index 86% rename from weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_for_procedure-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_for_procedure-0.1.0.yaml index e63cfd5ad..c79d40f52 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_for_procedure-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_for_procedure-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_for_procedure-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_for_procedure-0.1.0" title: | GMAW process shielding gas @@ -12,14 +12,14 @@ examples: - - A shielding gas mixture of 82% argon and 18% CO2 with 20 l/min flowrate. - | - ! + ! use_torch_shielding_gas: true - torch_shielding_gas: ! + torch_shielding_gas: ! gas_component: - - ! + - ! gas_chemical_name: argon gas_percentage: !unit/quantity-1.1.0 {unit: percent, value: 82} - - ! + - ! gas_chemical_name: carbon dioxide gas_percentage: !unit/quantity-1.1.0 {unit: percent, value: 18} common_name: SG @@ -35,13 +35,13 @@ properties: torch_shielding_gas: description: | Composition of shielding gas expelled from a nozzle in the welding torch. - $ref: shielding_gas_type-1.0.0 + $ref: shielding_gas_type-0.1.0 torch_shielding_gas_flowrate: description: | Flow rate of shielding gas required or specified. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" use_backing_gas: @@ -52,13 +52,13 @@ properties: backing_gas: description: | Specification of the component gases of the mixture. - $ref: shielding_gas_type-1.0.0 + $ref: shielding_gas_type-0.1.0 backing_gas_flowrate: description: | Flowrate of backing gas. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" use_trailing_gas: @@ -69,13 +69,13 @@ properties: trailing_shielding_gas: description: | Composition or identification of trailing gas. - $ref: shielding_gas_type-1.0.0 + $ref: shielding_gas_type-0.1.0 trailing_shielding_gas_flowrate: description: | Flowrate of trailing gas during welding. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" diff --git a/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_type-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_type-0.1.0.yaml similarity index 93% rename from weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_type-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_type-0.1.0.yaml index 7a25bc06b..6ae1cd4aa 100644 --- a/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_type-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/aws/process/shielding_gas_type-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_type-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/aws/process/shielding_gas_type-0.1.0" title: | GMAW shielding gas @@ -13,12 +13,12 @@ examples: - - A shielding gas mixture of 82% argon and 18% CO2. - | - ! + ! gas_component: - - ! + - ! gas_chemical_name: argon gas_percentage: !unit/quantity-1.1.0 {unit: percent, value: 82} - - ! + - ! gas_chemical_name: carbon dioxide gas_percentage: !unit/quantity-1.1.0 {unit: percent, value: 18} common_name: SG @@ -29,7 +29,7 @@ properties: A single gas element. type: array items: - $ref: gas_component-1.0.0 + $ref: gas_component-0.1.0 common_name: description: | diff --git a/weldx/schemas/weldx.bam.de/weldx/core/data_array-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/data_array-0.1.0.yaml similarity index 80% rename from weldx/schemas/weldx.bam.de/weldx/core/data_array-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/data_array-0.1.0.yaml index dcfc52a38..2e15a72ee 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/data_array-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/data_array-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/data_array-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/data_array-0.1.0" title: | Schema that describes a data_array @@ -20,11 +20,11 @@ properties: An array of variables that represent coordinates. type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/core/variable-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/variable-0.1.*" data: description: | The actual data. - tag: "asdf://weldx.bam.de/weldx/tags/core/variable-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/variable-0.1.*" required: [attributes, coordinates, data] propertyOrder: [attributes, coordinates, data] diff --git a/weldx/schemas/weldx.bam.de/weldx/core/dataset-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/dataset-0.1.0.yaml similarity index 79% rename from weldx/schemas/weldx.bam.de/weldx/core/dataset-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/dataset-0.1.0.yaml index 6ea25119e..c5428bf81 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/dataset-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/dataset-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/dataset-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/dataset-0.1.0" title: | Schema that describes a dataset @@ -20,19 +20,19 @@ properties: An array of dimensions. type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/core/dimension-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/dimension-0.1.*" coordinates: description: | An array of variables that represent coordinates. type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/core/variable-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/variable-0.1.*" variables: description: | An array of variables. type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/core/variable-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/variable-0.1.*" required: [dimensions, coordinates, variables] propertyOrder: [attributes, dimensions, coordinates, variables] diff --git a/weldx/schemas/weldx.bam.de/weldx/core/dimension-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/dimension-0.1.0.yaml similarity index 90% rename from weldx/schemas/weldx.bam.de/weldx/core/dimension-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/dimension-0.1.0.yaml index ac08ff7d4..520d5d5ef 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/dimension-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/dimension-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/dimension-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/dimension-0.1.0" title: | Schema that describes a dimension diff --git a/weldx/schemas/weldx.bam.de/weldx/core/file-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/file-0.1.0.yaml similarity index 86% rename from weldx/schemas/weldx.bam.de/weldx/core/file-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/file-0.1.0.yaml index a4862f8d5..e97eab9f3 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/file-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/file-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/file-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/file-0.1.0" title: | Schema for a file. @@ -13,14 +13,14 @@ examples: - - Full description of a pdf-file without its content - | - ! + ! filename: file.pdf suffix: pdf hostname: my_computer directory: C:/Users/some_user/my_files size: 90571 - created: ! {value: '2020-12-09T12:51:20.653744500'} - modified: ! {value: '2020-12-10T13:14:17.362481500'} + created: ! {value: '2020-12-09T12:51:20.653744500'} + modified: ! {value: '2020-12-10T13:14:17.362481500'} content_hash: {algorithm: SHA-256, value: 5a6270ea5e2662c6489ee9e9c2201645e1b3cdadf0e3a621cca213a29ff4ae32} type: object @@ -40,11 +40,11 @@ properties: created: description: | The timestamp when the file was created. - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" modified: description: | The timestamp when the file was modified last. - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" hostname: description: | The name of the host machine accessing the file. diff --git a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml similarity index 98% rename from weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml index 6dbe1ae26..2745fdc20 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/geometry/spatial_data-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/geometry/spatial_data-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/geometry/spatial_data-0.1.0" title: | Schema for a point cloud. @@ -12,7 +12,7 @@ examples: - - A simple `SpatialData` with triangulation - | - ! + ! coordinates: !core/ndarray-1.0.0 data: - [0.0, 0.0, 0.0] diff --git a/weldx/schemas/weldx.bam.de/weldx/core/graph/di_edge-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/graph/di_edge-0.1.0.yaml similarity index 69% rename from weldx/schemas/weldx.bam.de/weldx/core/graph/di_edge-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/graph/di_edge-0.1.0.yaml index fcf25fb92..8b6f06141 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/graph/di_edge-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/graph/di_edge-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/graph/di_edge-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/graph/di_edge-0.1.0" title: | Graph edge. @@ -12,16 +12,16 @@ examples: - - An edge pointing to node A. - | - ! + ! direction: fwd - target_node: ! + target_node: ! name: A - - An edge pointing from node B. - | - ! + ! direction: bwd - target_node: ! + target_node: ! name: B type: object @@ -30,7 +30,7 @@ properties: type: string enum: [fwd, bwd] target_node: - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-0.1.*" attributes: type: object diff --git a/weldx/schemas/weldx.bam.de/weldx/core/graph/di_graph-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/graph/di_graph-0.1.0.yaml similarity index 83% rename from weldx/schemas/weldx.bam.de/weldx/core/graph/di_graph-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/graph/di_graph-0.1.0.yaml index fe31dfbd3..fc9eae53e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/graph/di_graph-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/graph/di_graph-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/graph/di_graph-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/graph/di_graph-0.1.0" title: | Directed Graph. @@ -15,35 +15,35 @@ examples: - - A directed graph with two branches - | - ! - root_node: ! + ! + root_node: ! name: A attributes: {node_attr: 3.14} edges: - - ! + - ! direction: fwd attributes: {edge_attr: 42} - target_node: ! + target_node: ! name: B attributes: {node_attr: 3.14} edges: - - ! + - ! direction: fwd attributes: {edge_attr: 42} - target_node: ! + target_node: ! name: H attributes: {node_attr: 3.14} - - ! + - ! direction: fwd attributes: {edge_attr: 42} - target_node: ! + target_node: ! name: C attributes: {node_attr: 3.14} edges: - - ! + - ! direction: bwd attributes: {edge_attr: 42} - target_node: ! + target_node: ! name: D attributes: {node_attr: 3.14} @@ -51,7 +51,7 @@ examples: type: object properties: root_node: - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-0.1.*" required: [root_node] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/core/graph/di_node-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/graph/di_node-0.1.0.yaml similarity index 59% rename from weldx/schemas/weldx.bam.de/weldx/core/graph/di_node-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/graph/di_node-0.1.0.yaml index 59aff13b7..390123d45 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/graph/di_node-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/graph/di_node-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/graph/di_node-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/graph/di_node-0.1.0" title: | Node of a directed graph. @@ -10,23 +10,23 @@ examples: - - A simple node without any child edges. - | - ! + ! name: A - - A simple node without any child edges and a simple attribute. - | - ! + ! name: A attributes: {node_attr: 3.14} - - A node with one child node. - | - ! + ! name: A edges: - - ! + - ! direction: fwd - target_node: ! + target_node: ! name: B type: object @@ -34,11 +34,11 @@ properties: name: anyOf: - type: string - - tag: "asdf://weldx.bam.de/weldx/tags/uuid-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/uuid-0.1.*" edges: type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-0.1.*" attributes: type: object diff --git a/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-0.1.0.yaml similarity index 97% rename from weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-0.1.0.yaml index 0873dce79..9d38cf5df 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/mathematical_expression-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/mathematical_expression-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/mathematical_expression-0.1.0" title: | Schema that describes a mathematical_expression. @@ -15,7 +15,7 @@ examples: - - A linear mathematical expression - | - ! + ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 {unit: volt, value: 1.2} @@ -33,7 +33,7 @@ properties: List of constant parameters that to be set in the mathematical expression. type: object oneOf: - - wx_property_tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - wx_property_tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - wx_property_tag: "tag:stsci.edu:asdf/unit/quantity-1.*" required: [expression] diff --git a/weldx/schemas/weldx.bam.de/weldx/core/time_series-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml similarity index 92% rename from weldx/schemas/weldx.bam.de/weldx/core/time_series-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml index db4a4d086..6c599548c 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/time_series-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/time_series-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/time_series-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/time_series-0.1.0" title: | Schema that describes a time series. @@ -12,14 +12,14 @@ examples: - - A time_series describing a constant value in time. - | - ! + ! unit: millimeter / second value: 10.0 - - A time_series describing a sine oscillation in 3d space along the z-axis - | - ! - expression: ! + ! + expression: ! expression: a*sin(o*t + p) + b parameters: a: !unit/quantity-1.1.0 @@ -60,7 +60,7 @@ oneOf: expression: description: | A mathematical expression that describes the time dependent behaviour. - tag: "asdf://weldx.bam.de/weldx/tags/core/mathematical_expression-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/mathematical_expression-0.1.*" unit: description: | Resulting unit of the data when the expression is evaluated. @@ -78,7 +78,7 @@ oneOf: time: description: | A set of time deltas. - tag: "asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-0.1.*" unit: description: | Unit of the data. diff --git a/weldx/schemas/weldx.bam.de/weldx/core/transformations/coordinate_system_hierarchy-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/transformations/coordinate_system_hierarchy-0.1.0.yaml similarity index 87% rename from weldx/schemas/weldx.bam.de/weldx/core/transformations/coordinate_system_hierarchy-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/transformations/coordinate_system_hierarchy-0.1.0.yaml index 122e873de..7a0457477 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/transformations/coordinate_system_hierarchy-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/transformations/coordinate_system_hierarchy-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/transformations/coordinate_system_hierarchy-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/transformations/coordinate_system_hierarchy-0.1.0" title: | Schema that describes a local coordinate system hierarchy @@ -13,59 +13,59 @@ examples: - - An abstract example of a coordinate system hierarchy with nested subsystems and without data - | - ! + ! name: CSM - graph: ! - root_node: ! + graph: ! + root_node: ! name: R attributes: data: {} edges: - - ! + - ! direction: bwd attributes: defined: true - transformation: ! {} - target_node: ! + transformation: ! {} + target_node: ! name: A attributes: data: {} - - ! + - ! direction: bwd attributes: defined: true - transformation: ! {} - target_node: ! + transformation: ! {} + target_node: ! name: B attributes: data: {} edges: - - ! + - ! direction: bwd attributes: defined: true - transformation: ! {} - target_node: ! + transformation: ! {} + target_node: ! name: Y attributes: data: {} edges: - - ! + - ! direction: bwd attributes: defined: true - transformation: ! {} - target_node: ! + transformation: ! {} + target_node: ! name: Z attributes: data: {} edges: - - ! + - ! direction: bwd attributes: defined: true - transformation: ! {} - target_node: ! + transformation: ! {} + target_node: ! name: V attributes: data: {} @@ -89,7 +89,7 @@ definitions: description: | A graph node that represents a coordinate system. allOf: - - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-0.1.*" - type: object properties: attributes: @@ -101,8 +101,8 @@ definitions: is it's yaml key inside of the object. type: object anyOf: - - wx_property_tag: "asdf://weldx.bam.de/weldx/tags/core/data_array-1.*" - - wx_property_tag: "asdf://weldx.bam.de/weldx/tags/core/geometry/spatial_data-1.*" + - wx_property_tag: "asdf://weldx.bam.de/weldx/tags/core/data_array-0.1.*" + - wx_property_tag: "asdf://weldx.bam.de/weldx/tags/core/geometry/spatial_data-0.1.*" edges: type: array items: @@ -113,7 +113,7 @@ definitions: description: | A graph edge that represents the transformation between to coordinate systems. allOf: - - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-0.1.*" - type: object properties: attributes: @@ -122,7 +122,7 @@ definitions: transformation: description: | The transformation between two coordinate systems - tag: "asdf://weldx.bam.de/weldx/tags/core/transformations/local_coordinate_system-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/transformations/local_coordinate_system-0.1.*" required: [transformation] target_node: $ref: "#/definitions/coordinate_system_node" @@ -144,7 +144,7 @@ definitions: reference_time: description: | The reference time of the subsystem. - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" common_node: description: | The coordinate system that is shared between the subsystem and its parent coordinate system hierarchy. @@ -178,12 +178,12 @@ properties: reference_time: description: | The reference time of the coordinate systeme hierarchy. - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" graph: description: A graph that describes how the different coordinate systems are organized. allOf: - - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_graph-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_graph-0.1.*" - type: object properties: root_node: diff --git a/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.0.yaml similarity index 76% rename from weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.0.yaml index 88d0a9240..55599afdb 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/transformations/local_coordinate_system-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/transformations/local_coordinate_system-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/transformations/local_coordinate_system-0.1.0" title: | Schema that describes a local coordinate system @@ -12,8 +12,8 @@ examples: - - A constant transformation describing a translation of 1 mm into the z direction - | - ! - coordinates: ! + ! + coordinates: ! name: coordinates dimensions: [c] dtype: - time: ! + ! + time: ! values: !core/ndarray-1.0.0 data: [0, 20000000000] datatype: int64 shape: [2] - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M20S} - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M20S} - coordinates: ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M20S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M20S} + coordinates: ! name: coordinates dimensions: [time, c] dtype: - orientations: ! + ! + orientations: ! name: orientations dimensions: [c, v] dtype: - time: ! + ! + time: ! values: !core/ndarray-1.0.0 data: [0, 20000000000] datatype: int64 shape: [2] - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M20S} - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M20S} - orientations: ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M20S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M20S} + orientations: ! name: orientations dimensions: [time, c, v] dtype: + ! angles: !unit/quantity-1.1.0 unit: degree value: !core/ndarray-1.0.0 @@ -23,7 +23,7 @@ examples: - - The quaternion rotation representation - | - ! + ! quaternions: !core/ndarray-1.0.0 data: [-0.012161306594124677, 0.19272730326230897, 0.4774233251326969, 0.8571903276509837] datatype: float64 @@ -31,7 +31,7 @@ examples: - - The matrix rotation representation. - | - ! + ! matrix: !core/ndarray-1.0.0 data: - [0.46984631039295427, -0.8231729446455007, 0.3187957775971679] @@ -42,7 +42,7 @@ examples: - - The rotation vector representation. - | - ! + ! rotvec: !core/ndarray-1.0.0 data: [-0.02555091083053722, 0.404920154109444, 1.0030666289407963] datatype: float64 @@ -94,7 +94,7 @@ oneOf: description: | Rotation angles data. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "degree" required: [sequence, angles] diff --git a/weldx/schemas/weldx.bam.de/weldx/core/variable-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/core/variable-0.1.0.yaml similarity index 95% rename from weldx/schemas/weldx.bam.de/weldx/core/variable-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/core/variable-0.1.0.yaml index 1013d010b..050042d29 100644 --- a/weldx/schemas/weldx.bam.de/weldx/core/variable-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/core/variable-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/core/variable-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/core/variable-0.1.0" title: | Schema that describes a variable. diff --git a/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml similarity index 88% rename from weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml index 395ff8412..5a2983117 100644 --- a/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/datamodels/single_pass_weld-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/datamodels/single_pass_weld-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/datamodels/single_pass_weld-0.1.0" title: | Single pass, single wire GMAW weldment. @@ -52,13 +52,13 @@ properties: type: object properties: welding_process: - $ref: "asdf://weldx.bam.de/weldx/schemas/process/GMAW-1.0.0" + $ref: "asdf://weldx.bam.de/weldx/schemas/process/GMAW-0.1.0" shielding_gas: - tag: "asdf://weldx.bam.de/weldx/tags/aws/process/shielding_gas_for_procedure-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/aws/process/shielding_gas_for_procedure-0.1.*" weld_speed: description: | The constant weld speed of the welding TCP movement. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "m/s" wx_shape: [1] welding_wire: @@ -70,7 +70,7 @@ properties: description: | The diameter of the welding wire. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "m" wx_shape: [1] @@ -84,37 +84,37 @@ properties: welding_current: description: | The signal representing the welding current measurement. - tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-0.1.*" wx_unit: "A" welding_voltage: description: | The signal representing the welding voltage measurement. - tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-0.1.*" wx_unit: "V" TCP: description: | Transformation describing the welding TCP movement in relation to the groove coordinates. The movement describes a linear motion between two points along the weld seam at constant velocity. - tag: "asdf://weldx.bam.de/weldx/tags/core/transformations/local_coordinate_system-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/transformations/local_coordinate_system-0.1.*" wx_shape: time: [2~] coordinate_systems: description: | The expanded coordinate system setup describing the welding experiment and associated coordinate systems in detail. - tag: "asdf://weldx.bam.de/weldx/tags/core/transformations/coordinate_system_hierarchy-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/transformations/coordinate_system_hierarchy-0.1.*" equipment: description: | A list of equipments used for measurements and describing the weld seam. type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-0.1.*" measurements: description: | List of all measurements associated with the experiment. type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/measurement/measurement-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/measurement-0.1.*" workpiece: description: | The workpiece to be welded defined by the base metal and the geometric description of the weld seam. @@ -142,12 +142,12 @@ properties: groove_shape: description: | Constant groove shape of the weld seam. - tag: "asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/*-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/*-0.1.*" seam_length: description: | Length of the linear weld seam. oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "m" required: [groove_shape, seam_length] @@ -155,7 +155,7 @@ properties: reference_timestamp: description: | An optional timestamp indicating the start of the welding process. - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" wx_metadata: description: | General metadata container. @@ -171,17 +171,17 @@ examples: - A simple welding application - | ! - TCP: ! - time: ! + TCP: ! + time: ! values: !core/ndarray-1.0.0 data: [0, 29000000000] datatype: int64 shape: [2] - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M29S} - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M29S} - orientations: ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M29S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M29S} + orientations: ! name: orientations dimensions: [c, v] dtype: + coordinates: ! name: coordinates dimensions: [time, c] dtype: + coordinate_systems: ! name: Coordinate system manager 0 - graph: ! - root_node: ! + graph: ! + root_node: ! name: base attributes: data: {} edges: - - ! + - ! direction: bwd attributes: defined: true - transformation: ! {} - target_node: ! + transformation: ! {} + target_node: ! name: workpiece attributes: data: {} edges: - - ! + - ! direction: bwd attributes: defined: true - transformation: ! - time: ! + transformation: ! + time: ! values: !core/ndarray-1.0.0 data: [0, 29000000000] datatype: int64 shape: [2] - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M29S} - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M29S} - orientations: ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M29S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M29S} + orientations: ! name: orientations dimensions: [c, v] dtype: + coordinates: ! name: coordinates dimensions: [time, c] dtype: + target_node: ! name: tcp_wire attributes: data: {} edges: - - ! + - ! direction: bwd attributes: defined: true - transformation: ! - coordinates: ! + transformation: ! + coordinates: ! name: coordinates dimensions: [c] dtype: + target_node: ! name: tcp_contact attributes: data: {} subsystems: [] equipment: - - &id008 ! + - &id008 ! name: HKS P1000-S3 sources: - - &id003 ! + - &id003 ! name: Current Sensor - output_signal: &id004 ! + output_signal: &id004 ! signal_type: analog unit: V - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.1} - - &id011 ! + - &id011 ! name: Voltage Sensor - output_signal: &id012 ! + output_signal: &id012 ! signal_type: analog unit: V - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.1} transformations: [] - - &id005 ! + - &id005 ! name: Beckhoff ELM3002-0000 sources: [] transformations: - - &id006 ! + - &id006 ! name: AD conversion current measurement - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.01} - func: ! + func: ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 {unit: 1 / volt, value: 3276.8} b: !unit/quantity-1.1.0 {unit: dimensionless, value: 0.0} type_transformation: AD - - &id013 ! + - &id013 ! name: AD conversion voltage measurement - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.01} - func: ! + func: ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 {unit: 1 / volt, value: 3276.8} b: !unit/quantity-1.1.0 {unit: dimensionless, value: 0.0} type_transformation: AD measurements: - - ! + - ! name: welding current measurement data: - - &id007 ! + - &id007 ! &id001 values: &id002 !core/ndarray-1.0.0 data: [300.0, 299.9999999999999, 299.99999999999983, 299.99999999999915, 299.9999999999996, 300.00000000000006] datatype: float64 shape: [6] - time: ! - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M10S} + time: ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M10S} freq: 2S - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M10S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M10S} unit: ampere shape: [6] interpolation: step *id001 : *id002 - measurement_chain: ! + measurement_chain: ! name: welding current measurement chain data_source: *id003 - graph: ! - root_node: ! + graph: ! + root_node: ! name: Current Sensor attributes: signal: *id004 edges: - - ! + - ! direction: fwd attributes: equipment: *id005 transformation: *id006 - target_node: ! + target_node: ! name: AD conversion current measurement attributes: - signal: ! + signal: ! signal_type: digital unit: dimensionless edges: - - ! + - ! direction: fwd attributes: - transformation: ! + transformation: ! name: Calibration current measurement - error: ! + error: ! deviation: 0.0 - func: ! + func: ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 {unit: ampere, value: 0.030517578125} @@ -377,62 +377,62 @@ examples: wx_metadata: software: !core/software-1.0.0 {name: Beckhoff TwinCAT ScopeView, version: 3.4.3143} - target_node: ! + target_node: ! name: Calibration current measurement attributes: - signal: &id015 ! + signal: &id015 ! signal_type: digital unit: ampere data: *id007 source_equipment: *id008 - - ! + - ! name: welding voltage measurement data: - - &id014 ! + - &id014 ! &id009 values: &id010 !core/ndarray-1.0.0 data: [40.299500249940486, 40.29950024994045, 40.299500249940436, 40.29950024994042, 40.29950024994049, 40.299500249940564] datatype: float64 shape: [6] - time: ! - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M10S} + time: ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M10S} freq: 2S - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M10S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M10S} unit: volt shape: [6] interpolation: step *id009 : *id010 - measurement_chain: ! + measurement_chain: ! name: welding voltage measurement chain data_source: *id011 - graph: ! - root_node: ! + graph: ! + root_node: ! name: Voltage Sensor attributes: signal: *id012 edges: - - ! + - ! direction: fwd attributes: equipment: *id005 transformation: *id013 - target_node: ! + target_node: ! name: AD conversion voltage measurement attributes: - signal: ! + signal: ! signal_type: digital unit: dimensionless edges: - - ! + - ! direction: fwd attributes: - transformation: ! + transformation: ! name: Calibration voltage measurement - error: ! + error: ! deviation: 0.0 - func: ! + func: ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 {unit: volt, value: 0.0030517578125} @@ -440,61 +440,61 @@ examples: wx_metadata: software: !core/software-1.0.0 {name: Beckhoff TwinCAT ScopeView, version: 3.4.3143} - target_node: ! + target_node: ! name: Calibration voltage measurement attributes: - signal: &id016 ! + signal: &id016 ! signal_type: digital unit: volt data: *id014 source_equipment: *id008 process: - shielding_gas: ! + shielding_gas: ! use_torch_shielding_gas: true - torch_shielding_gas: ! + torch_shielding_gas: ! gas_component: - - ! + - ! gas_chemical_name: argon gas_percentage: !unit/quantity-1.1.0 {unit: percent, value: 82} - - ! + - ! gas_chemical_name: carbon dioxide gas_percentage: !unit/quantity-1.1.0 {unit: percent, value: 18} common_name: SG torch_shielding_gas_flowrate: !unit/quantity-1.1.0 {unit: liter / minute, value: 20} - weld_speed: ! + weld_speed: ! unit: millimeter / second value: 10 - welding_process: ! + welding_process: ! base_process: pulse manufacturer: CLOOS meta: {modulation: UI} parameters: - base_current: ! + base_current: ! unit: ampere value: 60.0 - pulse_duration: ! + pulse_duration: ! unit: millisecond value: 5.0 - pulse_frequency: ! + pulse_frequency: ! unit: hertz value: 100.0 - pulse_voltage: ! + pulse_voltage: ! unit: volt value: 40.0 - wire_feedrate: ! + wire_feedrate: ! unit: meter / minute value: 10.0 power_source: Quinto tag: CLOOS/pulse welding_wire: diameter: !unit/quantity-1.1.0 {unit: millimeter, value: 1.2} - reference_timestamp: ! {value: '2020-11-09T12:00:00'} + reference_timestamp: ! {value: '2020-11-09T12:00:00'} welding_current: *id015 welding_voltage: *id016 workpiece: base_metal: {common_name: S355J2+N, standard: 'DIN EN 10225-2:2011'} geometry: - groove_shape: ! + groove_shape: ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 5} alpha: !unit/quantity-1.1.0 {unit: degree, value: 50} b: !unit/quantity-1.1.0 {unit: millimeter, value: 1} diff --git a/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-0.1.0.yaml similarity index 86% rename from weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-0.1.0.yaml index bfb2433db..6381cdaed 100644 --- a/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/debug/test_property_tag-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/debug/test_property_tag-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/debug/test_property_tag-0.1.0" title: | Test wx_property_type validation. @@ -11,5 +11,5 @@ description: | So far only one specific tag can be used. type: object additionalProperties: true # must be true to allow any property -wx_property_tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" +wx_property_tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" ... diff --git a/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-0.1.0.yaml similarity index 91% rename from weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-0.1.0.yaml index d7603bd00..0d901d17f 100644 --- a/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/debug/test_shape_validator-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/debug/test_shape_validator-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/debug/test_shape_validator-0.1.0" title: | simple demonstration and test schema for wx_shape validator syntax @@ -29,12 +29,12 @@ properties: quantity: oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_shape: [1] timeseries: - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_shape: [1] nested_prop: @@ -49,8 +49,8 @@ properties: time_prop: oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-1.*" - - tag: "asdf://weldx.bam.de/weldx/tags/time/datetimeindex-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-0.1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/time/datetimeindex-0.1.*" optional_prop: tag: "tag:stsci.edu:asdf/core/ndarray-1.*" diff --git a/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-0.1.0.yaml similarity index 81% rename from weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-0.1.0.yaml index 169b26516..d9d20e3a0 100644 --- a/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/debug/test_unit_validator-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/debug/test_unit_validator-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/debug/test_unit_validator-0.1.0" title: | simple demonstration schema for wx_unit validator @@ -11,7 +11,7 @@ properties: description: | a simple length quantity with unit validator oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "m" @@ -19,7 +19,7 @@ properties: description: | a simple velocity quantity allOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - type: object wx_unit: "m/s" @@ -27,7 +27,7 @@ properties: description: | a current quantity of shape [2,2] oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" nested_prop: @@ -38,12 +38,12 @@ properties: q1: description: a nested length of shape [3,3] oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" q2: description: a volume oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: q1: "m" diff --git a/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-0.1.0.yaml similarity index 89% rename from weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-0.1.0.yaml index 592c8fbda..85f5d815b 100644 --- a/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/equipment/measurement_equipment-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/equipment/measurement_equipment-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/equipment/measurement_equipment-0.1.0" title: | A piece of measurement equipment. @@ -13,16 +13,16 @@ examples: - - A analog to digital conversion equipment with a linear signal transformation. - | - ! + ! name: Beckhoff ELM3002-0000 sources: [] transformations: - - &id004 ! + - &id004 ! name: AD conversion current measurement type_transformation: AD - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.01} - func: ! + func: ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 {unit: 1 / volt, value: 3276.8} @@ -35,11 +35,11 @@ properties: sources: type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/measurement/source-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/source-0.1.*" transformations: type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal_transformation-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal_transformation-0.1.*" propertyOrder: [name, sources, transformations] required: [name] diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHUGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHUGroove-0.1.0.yaml similarity index 67% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHUGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHUGroove-0.1.0.yaml index 04dc81405..ef5e0583d 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHUGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHUGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHUGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHUGroove-0.1.0" title: | DHUGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple DHU-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 32} beta_1: !unit/quantity-1.1.0 {unit: degree, value: 10} beta_2: !unit/quantity-1.1.0 {unit: degree, value: 20} @@ -25,23 +25,23 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" beta_1: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" beta_2: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" R: - $ref: "../terms-1.0.0#/definitions/bevel-radius" + $ref: "../terms-0.1.0#/definitions/bevel-radius" R2: - $ref: "../terms-1.0.0#/definitions/bevel-radius" + $ref: "../terms-0.1.0#/definitions/bevel-radius" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h1: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h2: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, beta_1, beta_2, b, c] propertyOrder: [t, beta_1, beta_2, b, c, R, R2, h1, h2] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHVGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHVGroove-0.1.0.yaml similarity index 69% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHVGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHVGroove-0.1.0.yaml index b8176c45e..180dee872 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHVGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DHVGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHVGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DHVGroove-0.1.0" title: | DHVGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple DHV-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 11} beta_1: !unit/quantity-1.1.0 {unit: degree, value: 35} beta_2: !unit/quantity-1.1.0 {unit: degree, value: 60} @@ -23,19 +23,19 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" beta_1: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" beta_2: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h1: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h2: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, beta_1, beta_2, b, c] propertyOrder: [t, beta_1, beta_2, b, c, h1, h2] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DUGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DUGroove-0.1.0.yaml similarity index 67% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DUGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DUGroove-0.1.0.yaml index 0e9672e5f..c6d8f4f70 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DUGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DUGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DUGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DUGroove-0.1.0" title: | DUGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple DU-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 33} beta_1: !unit/quantity-1.1.0 {unit: degree, value: 8} beta_2: !unit/quantity-1.1.0 {unit: degree, value: 12} @@ -25,23 +25,23 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" beta_1: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" beta_2: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" R: - $ref: "../terms-1.0.0#/definitions/bevel-radius" + $ref: "../terms-0.1.0#/definitions/bevel-radius" R2: - $ref: "../terms-1.0.0#/definitions/bevel-radius" + $ref: "../terms-0.1.0#/definitions/bevel-radius" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h1: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h2: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, beta_1, beta_2, R, R2, b, c] propertyOrder: [t, beta_1, beta_2, R, R2, b, c, h1, h2] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DVGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DVGroove-0.1.0.yaml similarity index 70% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DVGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DVGroove-0.1.0.yaml index 8fabd8481..b833943e8 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DVGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/DVGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DVGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/DVGroove-0.1.0" title: | DVGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple DV-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 19} alpha_1: !unit/quantity-1.1.0 {unit: degree, value: 40} alpha_2: !unit/quantity-1.1.0 {unit: degree, value: 60} @@ -23,19 +23,19 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" alpha_1: - $ref: "../terms-1.0.0#/definitions/groove-angle" + $ref: "../terms-0.1.0#/definitions/groove-angle" alpha_2: - $ref: "../terms-1.0.0#/definitions/groove-angle" + $ref: "../terms-0.1.0#/definitions/groove-angle" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h1: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h2: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, alpha_1, alpha_2, b, c] propertyOrder: [t, alpha_1, alpha_2, b, c, h1, h2] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/FFGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/FFGroove-0.1.0.yaml similarity index 85% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/FFGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/FFGroove-0.1.0.yaml index 510aee278..a12042281 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/FFGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/FFGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/FFGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/FFGroove-0.1.0" title: | FFGroove representation. @@ -10,13 +10,13 @@ examples: - - A code 1.12 FF-Groove - | - ! + ! t_1: !unit/quantity-1.1.0 {unit: millimeter, value: 5} code_number: '1.12' - - A code 3.1.1 FF-Groove - | - ! + ! t_1: !unit/quantity-1.1.0 {unit: millimeter, value: 5} t_2: !unit/quantity-1.1.0 {unit: millimeter, value: 7} alpha: !unit/quantity-1.1.0 {unit: degree, value: 80} @@ -25,7 +25,7 @@ examples: - - A code 3.1.2 FF-Groove - | - ! + ! t_1: !unit/quantity-1.1.0 {unit: millimeter, value: 2} t_2: !unit/quantity-1.1.0 {unit: millimeter, value: 5} b: !unit/quantity-1.1.0 {unit: millimeter, value: 1} @@ -33,7 +33,7 @@ examples: - - A code 3.1.3 FF-Groove - | - ! + ! t_1: !unit/quantity-1.1.0 {unit: millimeter, value: 2} t_2: !unit/quantity-1.1.0 {unit: millimeter, value: 5} alpha: !unit/quantity-1.1.0 {unit: degree, value: 80} @@ -42,7 +42,7 @@ examples: - - A code 4.1.2 FF-Groove - | - ! + ! t_1: !unit/quantity-1.1.0 {unit: millimeter, value: 2} t_2: !unit/quantity-1.1.0 {unit: millimeter, value: 5} alpha: !unit/quantity-1.1.0 {unit: degree, value: 80} @@ -51,7 +51,7 @@ examples: - - A code 4.1.3 FF-Groove - | - ! + ! t_1: !unit/quantity-1.1.0 {unit: millimeter, value: 2} t_2: !unit/quantity-1.1.0 {unit: millimeter, value: 5} b: !unit/quantity-1.1.0 {unit: millimeter, value: 1} @@ -60,15 +60,15 @@ examples: type: object properties: t_1: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" t_2: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" alpha: - $ref: "../terms-1.0.0#/definitions/groove-angle" + $ref: "../terms-0.1.0#/definitions/groove-angle" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" e: - $ref: "../terms-1.0.0#/definitions/special-depth" + $ref: "../terms-0.1.0#/definitions/special-depth" required: [t_1] propertyOrder: [t_1, t_2, alpha, b, e] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HUGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HUGroove-0.1.0.yaml similarity index 71% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HUGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HUGroove-0.1.0.yaml index 4862124c9..d63ae412e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HUGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HUGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HUGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HUGroove-0.1.0" title: | HUGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple HU-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 18} beta: !unit/quantity-1.1.0 {unit: degree, value: 15} R: !unit/quantity-1.1.0 {unit: millimeter, value: 8} @@ -21,15 +21,15 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" beta: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" R: - $ref: "../terms-1.0.0#/definitions/bevel-radius" + $ref: "../terms-0.1.0#/definitions/bevel-radius" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, beta, R, b, c] propertyOrder: [t, beta, R, b, c] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HVGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HVGroove-0.1.0.yaml similarity index 73% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HVGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HVGroove-0.1.0.yaml index e807ec683..29771e5d0 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HVGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/HVGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HVGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/HVGroove-0.1.0" title: | HVGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple HV-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 9} beta: !unit/quantity-1.1.0 {unit: degree, value: 55} b: !unit/quantity-1.1.0 {unit: millimeter, value: 2} @@ -20,13 +20,13 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" beta: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, beta, b, c] propertyOrder: [t, beta, b, c] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/IGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/IGroove-0.1.0.yaml similarity index 78% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/IGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/IGroove-0.1.0.yaml index ee81e1770..c80c19632 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/IGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/IGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/IGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/IGroove-0.1.0" title: | IGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple I-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 4} b: !unit/quantity-1.1.0 {unit: millimeter, value: 4} code_number: [1.2.1, 1.2.2, '2.1'] @@ -18,9 +18,9 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" required: [t, b] propertyOrder: [t, b] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UGroove-0.1.0.yaml similarity index 71% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UGroove-0.1.0.yaml index a65d46bb1..8076cd90e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UGroove-0.1.0" title: | UGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple U-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 15} beta: !unit/quantity-1.1.0 {unit: degree, value: 9} R: !unit/quantity-1.1.0 {unit: millimeter, value: 6} @@ -21,15 +21,15 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" beta: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" R: - $ref: "../terms-1.0.0#/definitions/bevel-radius" + $ref: "../terms-0.1.0#/definitions/bevel-radius" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, beta, R, b, c] propertyOrder: [t, beta, R, b, c] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UVGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UVGroove-0.1.0.yaml similarity index 70% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UVGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UVGroove-0.1.0.yaml index d2dba6944..185595c89 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UVGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/UVGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UVGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/UVGroove-0.1.0" title: | UVGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple UV-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 12} alpha: !unit/quantity-1.1.0 {unit: degree, value: 60} beta: !unit/quantity-1.1.0 {unit: degree, value: 11} @@ -22,17 +22,17 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" alpha: - $ref: "../terms-1.0.0#/definitions/groove-angle" + $ref: "../terms-0.1.0#/definitions/groove-angle" beta: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" R: - $ref: "../terms-1.0.0#/definitions/bevel-radius" + $ref: "../terms-0.1.0#/definitions/bevel-radius" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" h: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, alpha, beta, R, b, h] propertyOrder: [t, alpha, beta, R, b, h] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VGroove-0.1.0.yaml similarity index 78% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VGroove-0.1.0.yaml index c67dd19ff..9f2290aee 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VGroove-0.1.0" title: | VGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple V-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 15} alpha: !unit/quantity-1.1.0 {unit: degree, value: 40} b: !unit/quantity-1.1.0 {unit: millimeter, value: 2} @@ -22,19 +22,19 @@ properties: t: description: | The workpiece thickness. - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" alpha: description: | The full groove angle. - $ref: "../terms-1.0.0#/definitions/groove-angle" + $ref: "../terms-0.1.0#/definitions/groove-angle" b: description: | The root gap between both plates. - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: description: | The root face. - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, alpha, b, c] propertyOrder: [t, alpha, b, c] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VVGroove-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VVGroove-0.1.0.yaml similarity index 70% rename from weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VVGroove-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VVGroove-0.1.0.yaml index 2dbcbf13d..eecef2368 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VVGroove-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/iso_9692_1_2013_12/VVGroove-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VVGroove-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/VVGroove-0.1.0" title: | VVGroove representation. @@ -10,7 +10,7 @@ examples: - - A simple VV-Groove - | - ! + ! t: !unit/quantity-1.1.0 {unit: millimeter, value: 12} alpha: !unit/quantity-1.1.0 {unit: degree, value: 70} beta: !unit/quantity-1.1.0 {unit: degree, value: 13} @@ -22,17 +22,17 @@ examples: type: object properties: t: - $ref: "../terms-1.0.0#/definitions/workpiece-thickness" + $ref: "../terms-0.1.0#/definitions/workpiece-thickness" alpha: - $ref: "../terms-1.0.0#/definitions/groove-angle" + $ref: "../terms-0.1.0#/definitions/groove-angle" beta: - $ref: "../terms-1.0.0#/definitions/bevel-angle" + $ref: "../terms-0.1.0#/definitions/bevel-angle" b: - $ref: "../terms-1.0.0#/definitions/root-gap" + $ref: "../terms-0.1.0#/definitions/root-gap" c: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" h: - $ref: "../terms-1.0.0#/definitions/root-face" + $ref: "../terms-0.1.0#/definitions/root-face" required: [t, alpha, beta, b, c, h] propertyOrder: [t, alpha, beta, b, c, h] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/groove/terms-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/groove/terms-0.1.0.yaml similarity index 72% rename from weldx/schemas/weldx.bam.de/weldx/groove/terms-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/groove/terms-0.1.0.yaml index 007fc16c3..b6194cf6e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/groove/terms-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/groove/terms-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/terms-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/groove/iso_9692_1_2013_12/terms-0.1.0" title: | DIN EN ISO 9692-1 definitions @@ -14,7 +14,7 @@ definitions: description: | Workpiece thickness oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "mm" @@ -22,7 +22,7 @@ definitions: description: | Root gap oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "mm" @@ -30,7 +30,7 @@ definitions: description: | Groove angle oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "deg" @@ -38,7 +38,7 @@ definitions: description: | Bevel angle oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "deg" @@ -46,7 +46,7 @@ definitions: description: | Bevel radius oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "mm" @@ -54,7 +54,7 @@ definitions: description: | Root face oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "mm" @@ -62,7 +62,7 @@ definitions: description: | Special depth oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" wx_unit: "mm" diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/error-0.1.0.yaml similarity index 74% rename from weldx/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/measurement/error-0.1.0.yaml index 2f33f8db5..e3951c2fa 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/error-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/measurement/error-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/measurement/error-0.1.0" title: | Measurement error description. @@ -12,7 +12,7 @@ examples: - - An error representing a deviation of 0.1%. - | - ! + ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.1} type: object @@ -22,7 +22,7 @@ properties: A simple numerical representation of the error. oneOf: - type: number - - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*" - tag: "tag:stsci.edu:asdf/unit/quantity-1.*" required: [deviation] flowStyle: block diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-0.1.0.yaml similarity index 71% rename from weldx/schemas/weldx.bam.de/weldx/measurement/measurement-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/measurement/measurement-0.1.0.yaml index 28d76c2b8..d80aaf3c8 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/measurement-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/measurement/measurement-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/measurement/measurement-0.1.0" title: | Schema that describes a measurement @@ -12,10 +12,10 @@ properties: data: type: array items: - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" measurement_chain: - tag: "asdf://weldx.bam.de/weldx/tags/measurement/measurement_chain-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/measurement_chain-0.1.*" propertyOrder: [name, data, measurement_chain] diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/measurement_chain-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/measurement_chain-0.1.0.yaml similarity index 90% rename from weldx/schemas/weldx.bam.de/weldx/measurement/measurement_chain-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/measurement/measurement_chain-0.1.0.yaml index 41be5fc9f..ad96466cd 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/measurement_chain-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/measurement_chain-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/measurement/measurement_chain-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/measurement/measurement_chain-0.1.0" title: | Schema that describes a measurement_chain @@ -17,57 +17,57 @@ example: A measurement chain representing a current measurement. It consists of 2 transformations, an AD conversion and subsequent application of the calibration data. - | - ! + ! name: Welding current measurement chain - data_source: ! + data_source: ! name: Current sensor - output_signal: &id001 ! + output_signal: &id001 ! signal_type: analog unit: V - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.2} - graph: ! - root_node: ! + graph: ! + root_node: ! name: Current sensor attributes: signal: *id001 edges: - - ! + - ! direction: fwd attributes: - transformation: ! + transformation: ! name: AD conversion - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.025} - func: ! + func: ! expression: a*x parameters: a: !unit/quantity-1.1.0 {unit: 1 / volt, value: 1} type_transformation: AD - target_node: ! + target_node: ! name: AD conversion attributes: - signal: ! + signal: ! signal_type: digital unit: dimensionless edges: - - ! + - ! direction: fwd attributes: - transformation: ! + transformation: ! name: Calibration - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.1} - func: ! + func: ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 {unit: ampere, value: 75} b: !unit/quantity-1.1.0 {unit: ampere, value: 25} type_transformation: DD - target_node: ! + target_node: ! name: Calibration attributes: - signal: ! + signal: ! signal_type: digital unit: ampere @@ -76,7 +76,7 @@ definitions: description: | A graph node that represents a measurement signal. allOf: - - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_node-0.1.*" - type: object properties: attributes: @@ -85,7 +85,7 @@ definitions: signal: description: | The measurement signal - tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-0.1.*" required: [signal] edges: type: array @@ -98,7 +98,7 @@ definitions: description: | A graph edge that represents a signal transformation. allOf: - - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_edge-0.1.*" - type: object properties: attributes: @@ -107,11 +107,11 @@ definitions: transformation: description: | The performed transformation. - tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal_transformation-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal_transformation-0.1.*" equipment: description: | The equipment that performs the transformation - tag: "asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-0.1.*" required: [transformation] target_node: $ref: "#/definitions/signal_node" @@ -130,13 +130,13 @@ properties: data_source: description: | The source that generates the first signal and is the first element of the chain. - tag: "asdf://weldx.bam.de/weldx/tags/measurement/source-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/source-0.1.*" graph: description: | The measurement chain depicted by a graph. Signals are represented by the nodes and transformations by the edges. allOf: - - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_graph-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/core/graph/di_graph-0.1.*" - type: object properties: root_node: @@ -145,7 +145,7 @@ properties: source_equipment: description: | The equipment that produces the source signal. - tag: "asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/equipment/measurement_equipment-0.1.*" propertyOrder: [name, data_source, graph, source_equipment] diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/signal-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/signal-0.1.0.yaml similarity index 76% rename from weldx/schemas/weldx.bam.de/weldx/measurement/signal-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/measurement/signal-0.1.0.yaml index e02937940..a6cc48b5e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/signal-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/signal-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/measurement/signal-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/measurement/signal-0.1.0" title: | Representation of a measurement signal with optional data attached. @@ -11,13 +11,13 @@ examples: - - A signal representing an analog voltage measurement without data. - | - ! + ! signal_type: analog unit: V - - A digital dimensionless signal. - | - ! + ! signal_type: digital unit: '' @@ -34,7 +34,7 @@ properties: data: description: | Measurement data that was produced by the signal. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" propertyOrder: [signal_type, unit, data] diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-0.1.0.yaml similarity index 93% rename from weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-0.1.0.yaml index 5519fa0b8..a6c29a253 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/signal_transformation-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/measurement/signal_transformation-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/measurement/signal_transformation-0.1.0" title: | Signal transformation step. @@ -12,19 +12,19 @@ examples: - - A simple analog-digital conversion without a function that affects the signal values - | - ! + ! name: AD conversion - error: ! + error: ! deviation: !unit/quantity-1.1.0 { unit: percent, value: 0.5 } type_transformation: AD - - A transformation that calculates amperes based on volts using a given function - | - ! + ! name: Volt-Ampere-Conversion - error: ! + error: ! deviation: !unit/quantity-1.1.0 { unit: percent, value: 1.5 } - func: ! + func: ! expression: a*x + b parameters: a: !unit/quantity-1.1.0 { unit: ampere / volt, value: 3 } @@ -39,11 +39,11 @@ properties: error: description: | The error caused by the transformation - tag: "asdf://weldx.bam.de/weldx/tags/measurement/error-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/error-0.1.*" func: description: | A mathematical expression that describes the relation between the values of the output and input signal - tag: "asdf://weldx.bam.de/weldx/tags/core/mathematical_expression-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/mathematical_expression-0.1.*" type_transformation: description: | A string of length 2 containing an arbitrary combination of the letters A (for analog) and D (for digital). The diff --git a/weldx/schemas/weldx.bam.de/weldx/measurement/source-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/measurement/source-0.1.0.yaml similarity index 74% rename from weldx/schemas/weldx.bam.de/weldx/measurement/source-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/measurement/source-0.1.0.yaml index f80866603..72bcb7e03 100644 --- a/weldx/schemas/weldx.bam.de/weldx/measurement/source-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/measurement/source-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/measurement/source-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/measurement/source-0.1.0" title: | Schema that describes a measurement source. @@ -10,12 +10,12 @@ examples: - - The source of a current measurement outputting an analog signal. - | - ! + ! name: Current Sensor - output_signal: ! + output_signal: ! signal_type: analog unit: V - error: ! + error: ! deviation: !unit/quantity-1.1.0 {unit: percent, value: 0.1} type: object @@ -27,11 +27,11 @@ properties: output_signal: description: | The signal that is produced by the source. - tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/signal-0.1.*" error: description: | The error of the source. - tag: "asdf://weldx.bam.de/weldx/tags/measurement/error-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/measurement/error-0.1.*" required: [name, output_signal] propertyOrder: [name, output_signal, error] diff --git a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-0.1.0.yaml similarity index 53% rename from weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-0.1.0.yaml index 84635819d..8530fef43 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/pulse-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/process/CLOOS/pulse-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/process/CLOOS/pulse-0.1.0" title: | CLOOS GMAW pulsed processes. @@ -10,8 +10,8 @@ description: | Base schema describing a default UI or II modulated pulsed GMAW processes. allOf: - - $ref: "../terms-1.0.0#/base_process" + - $ref: "../terms-0.1.0#/base_process" - oneOf: - - $ref: "../terms-1.0.0#/process/pulse/UI" - - $ref: "../terms-1.0.0#/process/pulse/II" + - $ref: "../terms-0.1.0#/process/pulse/UI" + - $ref: "../terms-0.1.0#/process/pulse/II" ... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-0.1.0.yaml similarity index 79% rename from weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-0.1.0.yaml index be519c00d..96e3f52c3 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/CLOOS/spray_arc-0.1.0.yaml @@ -1,23 +1,23 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/process/CLOOS/spray_arc-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/process/CLOOS/spray_arc-0.1.0" title: | CLOOS spray arc process. allOf: - - $ref: "../generic-1.0.0#/spray" + - $ref: "../generic-0.1.0#/spray" - type: object properties: parameters: type: object properties: impedance: - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "percent" characteristic: - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "V/A" required: [impedance,characteristic] diff --git a/weldx/schemas/weldx.bam.de/weldx/process/GMAW-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml similarity index 81% rename from weldx/schemas/weldx.bam.de/weldx/process/GMAW-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml index 2df5a6069..bc909d7d3 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/GMAW-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/GMAW-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/process/GMAW-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/process/GMAW-0.1.0" title: | Generic GMAW process definition. @@ -10,24 +10,24 @@ examples: - - A constant pulsed GMAW process for a CLOOS Quinto power source - | - ! + ! base_process: pulse manufacturer: CLOOS meta: {modulation: UI} parameters: - base_current: ! + base_current: ! unit: ampere value: 60.0 - pulse_duration: ! + pulse_duration: ! unit: millisecond value: 5.0 - pulse_frequency: ! + pulse_frequency: ! unit: hertz value: 100.0 - pulse_voltage: ! + pulse_voltage: ! unit: volt value: 40.0 - wire_feedrate: ! + wire_feedrate: ! unit: meter / minute value: 10.0 power_source: Quinto @@ -35,39 +35,39 @@ examples: - - A spray arc process where the voltage decreases linearly from 40 V to 20 V over 10 s - | - ! + ! base_process: spray manufacturer: CLOOS parameters: - characteristic: ! + characteristic: ! unit: volt / ampere value: 5.0 - impedance: ! + impedance: ! unit: percent value: 10.0 - voltage: ! + voltage: ! &id001 values: &id002 !core/ndarray-1.0.0 data: [40.0, 20.0] datatype: float64 shape: [2] - time: ! + time: ! values: !core/ndarray-1.0.0 data: [0, 10000000000] datatype: int64 shape: [2] - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M10S} - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M10S} + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M10S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M10S} unit: volt shape: [2] interpolation: linear *id001 : *id002 - wire_feedrate: ! + wire_feedrate: ! unit: meter / minute value: 10.0 power_source: Quinto tag: CLOOS/spray_arc -$ref: "./terms-1.0.0#/base_process" +$ref: "./terms-0.1.0#/base_process" ... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/generic-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/generic-0.1.0.yaml new file mode 100644 index 000000000..474901c6d --- /dev/null +++ b/weldx/schemas/weldx.bam.de/weldx/process/generic-0.1.0.yaml @@ -0,0 +1,13 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "asdf://weldx.bam.de/weldx/schemas/process/generic-0.1.0" + +title: | + Generic GMAW processes + +spray: + allOf: + - $ref: "./terms-0.1.0#/base_process" + - $ref: "./terms-0.1.0#/process/spray" +... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml deleted file mode 100644 index 35e88eacd..000000000 --- a/weldx/schemas/weldx.bam.de/weldx/process/generic-1.0.0.yaml +++ /dev/null @@ -1,13 +0,0 @@ -%YAML 1.1 ---- -$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/process/generic-1.0.0" - -title: | - Generic GMAW processes - -spray: - allOf: - - $ref: "./terms-1.0.0#/base_process" - - $ref: "./terms-1.0.0#/process/spray" -... diff --git a/weldx/schemas/weldx.bam.de/weldx/process/terms-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/process/terms-0.1.0.yaml similarity index 84% rename from weldx/schemas/weldx.bam.de/weldx/process/terms-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/process/terms-0.1.0.yaml index 7605ff902..7844514c2 100644 --- a/weldx/schemas/weldx.bam.de/weldx/process/terms-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/process/terms-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/process/terms-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/process/terms-0.1.0" title: | GMAW process definitions @@ -19,7 +19,7 @@ base_process: type: string parameters: type: object - wx_property_tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + wx_property_tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" meta: type: object required: [base_process,manufacturer,power_source,parameters] @@ -101,49 +101,49 @@ parameters: wire_feedrate: description: | Nominal average wire feedrate. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "m/s" voltage: description: | Nominal target voltage for spray arc processes. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "V" pulse_voltage: description: | Nominal target pulse voltage. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "V" pulse_current: description: | Nominal target pulse current. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "A" pulse_duration: description: | Nominal target pulse duration. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "s" pulse_frequency: description: | Nominal target pulse frequency. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "Hz" base_voltage: description: | Nominal target base voltage. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "V" base_current: description: | Nominal target base current. - tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" wx_unit: "A" ... diff --git a/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-0.1.0.yaml similarity index 77% rename from weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-0.1.0.yaml index 78f5ed2c8..4976ad2a6 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/datetimeindex-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/time/datetimeindex-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/time/datetimeindex-0.1.0" title: | Represents an array of timestamps following pandas.DatetimeIndex. @@ -10,12 +10,12 @@ examples: - - A regular datetimeindex starting at 2020-01-01 and a 1 day interval till 2020-01-06 - | - ! - start: ! {value: '2020-01-01T00:00:00'} - end: ! {value: '2020-01-05T00:00:00'} + ! + start: ! {value: '2020-01-01T00:00:00'} + end: ! {value: '2020-01-05T00:00:00'} freq: D - min: ! {value: '2020-01-01T00:00:00'} - max: ! {value: '2020-01-05T00:00:00'} + min: ! {value: '2020-01-01T00:00:00'} + max: ! {value: '2020-01-05T00:00:00'} definitions: values: @@ -26,12 +26,12 @@ definitions: start: description: | Timedelta of the first value. - $ref: timestamp-1.0.0 + $ref: timestamp-0.1.0 end: description: | Timestamp of the last value. - $ref: timestamp-1.0.0 + $ref: timestamp-0.1.0 freq: description: | @@ -43,12 +43,12 @@ definitions: min: description: | Minimum timestamp in the index. - $ref: timestamp-1.0.0 + $ref: timestamp-0.1.0 max: description: | Maximum timestamp in the index. - $ref: timestamp-1.0.0 + $ref: timestamp-0.1.0 oneOf: - type: object diff --git a/weldx/schemas/weldx.bam.de/weldx/time/time-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/time-0.1.0.yaml similarity index 58% rename from weldx/schemas/weldx.bam.de/weldx/time/time-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/time/time-0.1.0.yaml index dacd43138..3fbe0dca4 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/time-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/time-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/time/time-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/time/time-0.1.0" title: | Represents a single or multiple timestamps or timedeltas. @@ -10,34 +10,34 @@ examples: - - A single timedelta of 2 seconds - | - ! - values: ! {value: P0DT0H0M2S} + ! + values: ! {value: P0DT0H0M2S} - - A timedelta series from 0 s to 4 s with a 2 s frequency - | - ! - values: ! - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M4S} + ! + values: ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M4S} freq: 2S - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M4S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M4S} - - A single timestamp - | - ! - values: ! {value: '2021-08-01T00:00:00'} + ! + values: ! {value: '2021-08-01T00:00:00'} - - An absolute time index with a 1 s frequency - | - ! - values: ! - start: ! {value: '2021-01-01T00:00:00'} - end: ! {value: '2021-01-01T00:00:02'} + ! + values: ! + start: ! {value: '2021-01-01T00:00:00'} + end: ! {value: '2021-01-01T00:00:02'} freq: S - min: ! {value: '2021-01-01T00:00:00'} - max: ! {value: '2021-01-01T00:00:02'} - reference_time: ! {value: '2021-01-01T00:00:00'} + min: ! {value: '2021-01-01T00:00:00'} + max: ! {value: '2021-01-01T00:00:02'} + reference_time: ! {value: '2021-01-01T00:00:00'} type: object properties: @@ -46,16 +46,16 @@ properties: The time values that are represented by the Time object. type: object oneOf: - - tag: "asdf://weldx.bam.de/weldx/tags/time/timedelta-1.*" - - tag: "asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-1.*" - - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" - - tag: "asdf://weldx.bam.de/weldx/tags/time/datetimeindex-1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/time/timedelta-0.1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/time/timedeltaindex-0.1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" + - tag: "asdf://weldx.bam.de/weldx/tags/time/datetimeindex-0.1.*" reference_time: description: | Indicates a specific reference timestamp for the time object. type: object - tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/time/timestamp-0.1.*" required: [values] propertyOrder: [values, reference_time] diff --git a/weldx/schemas/weldx.bam.de/weldx/time/timedelta-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/timedelta-0.1.0.yaml similarity index 77% rename from weldx/schemas/weldx.bam.de/weldx/time/timedelta-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/time/timedelta-0.1.0.yaml index 8fccedae3..c93b8a25d 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/timedelta-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/timedelta-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/time/timedelta-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/time/timedelta-0.1.0" title: | Represents a difference between two instances in time. @@ -10,7 +10,7 @@ examples: - - A timedelta of 10 s - | - ! {value: P0DT0H0M10S} + ! {value: P0DT0H0M10S} type: object properties: diff --git a/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml similarity index 71% rename from weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml index 79dfc9038..bda5bbdbb 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/timedeltaindex-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/time/timedeltaindex-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/time/timedeltaindex-0.1.0" title: | Represents an array of timedeltas following pandas.TimedeltaIndex. @@ -10,24 +10,24 @@ examples: - - A regular spaced timedeltaindex ranging from 0 s to 10 s with a 2 s frequency - | - ! - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M10S} + ! + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M10S} freq: 2S - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M10S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M10S} - - An irregular timedeltaindex representing timestamps at 0 s, 4 s, 6 s and 10 s - | - ! + ! values: !core/ndarray-1.0.0 data: [0, 4000000000, 6000000000, 10000000000] datatype: int64 shape: [4] - start: ! {value: P0DT0H0M0S} - end: ! {value: P0DT0H0M10S} - min: ! {value: P0DT0H0M0S} - max: ! {value: P0DT0H0M10S} + start: ! {value: P0DT0H0M0S} + end: ! {value: P0DT0H0M10S} + min: ! {value: P0DT0H0M0S} + max: ! {value: P0DT0H0M10S} definitions: values: @@ -38,12 +38,12 @@ definitions: start: description: | Timedelta of the first value. - $ref: timedelta-1.0.0 + $ref: timedelta-0.1.0 end: description: | Timedelta of the last value. - $ref: timedelta-1.0.0 + $ref: timedelta-0.1.0 freq: description: | @@ -55,12 +55,12 @@ definitions: min: description: | Minimum timedelta in the index. - $ref: timedelta-1.0.0 + $ref: timedelta-0.1.0 max: description: | Maximum timedelta in the index. - $ref: timedelta-1.0.0 + $ref: timedelta-0.1.0 oneOf: - type: object diff --git a/weldx/schemas/weldx.bam.de/weldx/time/timestamp-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/time/timestamp-0.1.0.yaml similarity index 82% rename from weldx/schemas/weldx.bam.de/weldx/time/timestamp-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/time/timestamp-0.1.0.yaml index c62ce12c0..897b92e72 100644 --- a/weldx/schemas/weldx.bam.de/weldx/time/timestamp-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/time/timestamp-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/time/timestamp-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/time/timestamp-0.1.0" title: | Represents a single instance in time. @@ -10,15 +10,15 @@ examples: - - A timestamp representing the date 2020-01-01 12:00:00 (without timezone information) - | - ! {value: '2020-01-01T00:00:00'} + ! {value: '2020-01-01T00:00:00'} - - A timestamp representing the date 2020-01-01 12:00:00 in UTC time - | - ! {value: '2020-01-01T12:00:00+00:00'} + ! {value: '2020-01-01T12:00:00+00:00'} - - A timestamp representing the date 2020-01-01 12:00:00 in CET time - | - ! {value: '2020-01-01T12:00:00+01:00'} + ! {value: '2020-01-01T12:00:00+01:00'} type: object properties: diff --git a/weldx/schemas/weldx.bam.de/weldx/unit/dimension-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/unit/dimension-0.1.0.yaml similarity index 95% rename from weldx/schemas/weldx.bam.de/weldx/unit/dimension-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/unit/dimension-0.1.0.yaml index 18b4b9f30..81fb07691 100644 --- a/weldx/schemas/weldx.bam.de/weldx/unit/dimension-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/unit/dimension-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/unit/dimension-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/unit/dimension-0.1.0" title: | Describes the dimension of a quantity. diff --git a/weldx/schemas/weldx.bam.de/weldx/unit/quantity-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/unit/quantity-0.1.0.yaml similarity index 65% rename from weldx/schemas/weldx.bam.de/weldx/unit/quantity-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/unit/quantity-0.1.0.yaml index f7698d97b..a1b0fe603 100644 --- a/weldx/schemas/weldx.bam.de/weldx/unit/quantity-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/unit/quantity-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/unit/quantity-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/unit/quantity-0.1.0" title: > Represents a Quantity object from pint. @@ -13,24 +13,24 @@ examples: - - A quantity consisting of a scalar value and unit - | - ! + ! value: 3.14159 - unit: ! kilometer + unit: ! kilometer - - A quantity with an array of values - | - ! + ! value: !core/ndarray-1.0.0 [1, 2, 3, 4] - unit: ! ampere + unit: ! ampere - - A quantity with an n-dimensional array of values - | - ! + ! value: !core/ndarray-1.0.0 datatype: float64 data: [[1, 2, 3], [4, 5, 6]] - unit: ! meter / second + unit: ! meter / second type: object @@ -44,6 +44,6 @@ properties: unit: description: | The unit corresponding to the values - tag: "asdf://weldx.bam.de/weldx/tags/unit/unit-1.*" + tag: "asdf://weldx.bam.de/weldx/tags/unit/unit-0.1.*" required: [value, unit] ... diff --git a/weldx/schemas/weldx.bam.de/weldx/unit/unit-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/unit/unit-0.1.0.yaml similarity index 50% rename from weldx/schemas/weldx.bam.de/weldx/unit/unit-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/unit/unit-0.1.0.yaml index 59bf3a29c..cfc0b618d 100644 --- a/weldx/schemas/weldx.bam.de/weldx/unit/unit-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/unit/unit-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/unit/unit-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/unit/unit-0.1.0" title: | Describes a physical unit. @@ -10,8 +10,8 @@ examples: - - A 'meter' unit. - | - ! meter + ! meter type: string -tag: "asdf://weldx.bam.de/weldx/tags/unit/unit-1.*" +tag: "asdf://weldx.bam.de/weldx/tags/unit/unit-0.1.*" ... diff --git a/weldx/schemas/weldx.bam.de/weldx/uuid-1.0.0.yaml b/weldx/schemas/weldx.bam.de/weldx/uuid-0.1.0.yaml similarity index 68% rename from weldx/schemas/weldx.bam.de/weldx/uuid-1.0.0.yaml rename to weldx/schemas/weldx.bam.de/weldx/uuid-0.1.0.yaml index 96b3b13cf..96ec3732e 100644 --- a/weldx/schemas/weldx.bam.de/weldx/uuid-1.0.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/uuid-0.1.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "asdf://weldx.bam.de/weldx/schemas/uuid-1.0.0" +id: "asdf://weldx.bam.de/weldx/schemas/uuid-0.1.0" title: | Version 4 UUID @@ -13,10 +13,10 @@ examples: - - A version 4 UUID string - | - ! 448414c4-da7a-4832-9219-5e6042c2e96e + ! 448414c4-da7a-4832-9219-5e6042c2e96e type: string -tag: "asdf://weldx.bam.de/weldx/tags/uuid-1.*" +tag: "asdf://weldx.bam.de/weldx/tags/uuid-0.1.*" pattern: "^[0-9a-f]{8}-[0-9a-f]{4}-[4][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$" ... diff --git a/weldx/tags/aws/design/base_metal.py b/weldx/tags/aws/design/base_metal.py index 4de08d197..ac04fa15c 100644 --- a/weldx/tags/aws/design/base_metal.py +++ b/weldx/tags/aws/design/base_metal.py @@ -32,5 +32,5 @@ class BaseMetal: BaseMetalConverter = dataclass_serialization_class( class_type=BaseMetal, class_name="aws/design/base_metal", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/aws/design/connection.py b/weldx/tags/aws/design/connection.py index f96dc2dc2..97e4fbfc5 100644 --- a/weldx/tags/aws/design/connection.py +++ b/weldx/tags/aws/design/connection.py @@ -21,5 +21,5 @@ class Connection: ConnectionConverter = dataclass_serialization_class( class_type=Connection, class_name="aws/design/connection", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/aws/design/joint_penetration.py b/weldx/tags/aws/design/joint_penetration.py index 832ebacc5..04de0bddf 100644 --- a/weldx/tags/aws/design/joint_penetration.py +++ b/weldx/tags/aws/design/joint_penetration.py @@ -24,5 +24,5 @@ class JointPenetration: JointPenetrationConverter = dataclass_serialization_class( class_type=JointPenetration, class_name="aws/design/joint_penetration", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/aws/design/sub_assembly.py b/weldx/tags/aws/design/sub_assembly.py index 274f04015..2bdfce26b 100644 --- a/weldx/tags/aws/design/sub_assembly.py +++ b/weldx/tags/aws/design/sub_assembly.py @@ -20,5 +20,5 @@ class SubAssembly: SubAssemblyConverter = dataclass_serialization_class( class_type=SubAssembly, class_name="aws/design/sub_assembly", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/aws/design/weld_details.py b/weldx/tags/aws/design/weld_details.py index b5cf07798..56bf241a8 100644 --- a/weldx/tags/aws/design/weld_details.py +++ b/weldx/tags/aws/design/weld_details.py @@ -17,5 +17,5 @@ class WeldDetails: WeldDetailsConverter = dataclass_serialization_class( - class_type=WeldDetails, class_name="aws/design/weld_details", version="1.0.0" + class_type=WeldDetails, class_name="aws/design/weld_details", version="0.1.0" ) diff --git a/weldx/tags/aws/design/weldment.py b/weldx/tags/aws/design/weldment.py index 31ea3ccd1..f0db82a95 100644 --- a/weldx/tags/aws/design/weldment.py +++ b/weldx/tags/aws/design/weldment.py @@ -16,5 +16,5 @@ class Weldment: WeldmentConverter = dataclass_serialization_class( - class_type=Weldment, class_name="aws/design/weldment", version="1.0.0" + class_type=Weldment, class_name="aws/design/weldment", version="0.1.0" ) diff --git a/weldx/tags/aws/design/workpiece.py b/weldx/tags/aws/design/workpiece.py index e9e6c44eb..a79f7e571 100644 --- a/weldx/tags/aws/design/workpiece.py +++ b/weldx/tags/aws/design/workpiece.py @@ -13,5 +13,5 @@ class Workpiece: WorkpieceConverter = dataclass_serialization_class( - class_type=Workpiece, class_name="aws/design/workpiece", version="1.0.0" + class_type=Workpiece, class_name="aws/design/workpiece", version="0.1.0" ) diff --git a/weldx/tags/aws/process/arc_welding_process.py b/weldx/tags/aws/process/arc_welding_process.py index 6b5c5af14..c11a7cc6d 100644 --- a/weldx/tags/aws/process/arc_welding_process.py +++ b/weldx/tags/aws/process/arc_welding_process.py @@ -66,6 +66,6 @@ def _from_yaml_tree(tree): ArcWeldingProcessConverter = dataclass_serialization_class( class_type=ArcWeldingProcess, class_name="aws/process/arc_welding_process", - version="1.0.0", + version="0.1.0", from_yaml_tree_mod=_from_yaml_tree, ) diff --git a/weldx/tags/aws/process/gas_component.py b/weldx/tags/aws/process/gas_component.py index c0ccfd092..dc7c81ae7 100644 --- a/weldx/tags/aws/process/gas_component.py +++ b/weldx/tags/aws/process/gas_component.py @@ -16,5 +16,5 @@ class GasComponent: GasComponentConverter = dataclass_serialization_class( - class_type=GasComponent, class_name="aws/process/gas_component", version="1.0.0" + class_type=GasComponent, class_name="aws/process/gas_component", version="0.1.0" ) diff --git a/weldx/tags/aws/process/shielding_gas_for_procedure.py b/weldx/tags/aws/process/shielding_gas_for_procedure.py index 631a43524..c6eeb6367 100644 --- a/weldx/tags/aws/process/shielding_gas_for_procedure.py +++ b/weldx/tags/aws/process/shielding_gas_for_procedure.py @@ -27,5 +27,5 @@ class ShieldingGasForProcedure: ShieldingGasForProcedureConverter = dataclass_serialization_class( class_type=ShieldingGasForProcedure, class_name="aws/process/shielding_gas_for_procedure", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/aws/process/shielding_gas_type.py b/weldx/tags/aws/process/shielding_gas_type.py index 0756ffa61..d3d769fb9 100644 --- a/weldx/tags/aws/process/shielding_gas_type.py +++ b/weldx/tags/aws/process/shielding_gas_type.py @@ -20,5 +20,5 @@ class ShieldingGasType: ShieldingGasTypeConverter = dataclass_serialization_class( class_type=ShieldingGasType, class_name="aws/process/shielding_gas_type", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/base_types.py b/weldx/tags/base_types.py index 884f345bf..e5adc3823 100644 --- a/weldx/tags/base_types.py +++ b/weldx/tags/base_types.py @@ -12,7 +12,7 @@ class UuidConverter(WeldxConverter): """Implements a version 4 UUID.""" - tags = ["asdf://weldx.bam.de/weldx/tags/uuid-1.*"] + tags = ["asdf://weldx.bam.de/weldx/tags/uuid-0.1.*"] types = [UUID] def to_yaml_tree(self, obj: UUID, tag: str, ctx: SerializationContext) -> str: diff --git a/weldx/tags/core/common_types.py b/weldx/tags/core/common_types.py index 303fd4d0c..561807ae7 100644 --- a/weldx/tags/core/common_types.py +++ b/weldx/tags/core/common_types.py @@ -25,7 +25,7 @@ class Dimension: DimensionConverter = dataclass_serialization_class( - class_type=Dimension, class_name="core/dimension", version="1.0.0" + class_type=Dimension, class_name="core/dimension", version="0.1.0" ) @@ -44,7 +44,7 @@ class VariableConverter(WeldxConverter): """Serialization class for a Variable""" name = "core/variable" - version = "1.0.0" + version = "0.1.0" types = [Variable] @staticmethod diff --git a/weldx/tags/core/data_array.py b/weldx/tags/core/data_array.py index d1df8e60c..5c4b03006 100644 --- a/weldx/tags/core/data_array.py +++ b/weldx/tags/core/data_array.py @@ -9,7 +9,7 @@ class XarrayDataArrayConverter(WeldxConverter): """Serialization class for xarray.DataArray.""" name = "core/data_array" - version = "1.0.0" + version = "0.1.0" types = [DataArray] def to_yaml_tree(self, obj: DataArray, tag: str, ctx) -> dict: diff --git a/weldx/tags/core/dataset.py b/weldx/tags/core/dataset.py index c2e6f020d..38e49f380 100644 --- a/weldx/tags/core/dataset.py +++ b/weldx/tags/core/dataset.py @@ -8,7 +8,7 @@ class XarrayDatasetConverter(WeldxConverter): """Serialization class for xarray.Dataset""" name = "core/dataset" - version = "1.0.0" + version = "0.1.0" types = [Dataset] def to_yaml_tree(self, obj: Dataset, tag: str, ctx) -> dict: diff --git a/weldx/tags/core/file.py b/weldx/tags/core/file.py index 63b409c8e..2af94cccd 100644 --- a/weldx/tags/core/file.py +++ b/weldx/tags/core/file.py @@ -140,7 +140,7 @@ class ExternalFileConverter(WeldxConverter): """Serialization class for `weldx.core.ExternalFile`.""" name = "core/file" - version = "1.0.0" + version = "0.1.0" types = [ExternalFile] def to_yaml_tree(self, obj: ExternalFile, tag: str, ctx) -> dict: diff --git a/weldx/tags/core/geometry/spatial_data.py b/weldx/tags/core/geometry/spatial_data.py index 384e22152..bcc8a85e8 100644 --- a/weldx/tags/core/geometry/spatial_data.py +++ b/weldx/tags/core/geometry/spatial_data.py @@ -21,7 +21,7 @@ def _from_yaml_tree_mod(tree): SpatialDataConverter = dataclass_serialization_class( class_type=SpatialData, class_name="core/geometry/spatial_data", - version="1.0.0", + version="0.1.0", to_yaml_tree_mod=_to_yaml_tree_mod, from_yaml_tree_mod=_from_yaml_tree_mod, ) diff --git a/weldx/tags/core/graph.py b/weldx/tags/core/graph.py index e9a2175fc..d6c6a1adc 100644 --- a/weldx/tags/core/graph.py +++ b/weldx/tags/core/graph.py @@ -21,7 +21,7 @@ class DiEdgeConverter(WeldxConverter): """ASDF type for `DiEdge`.""" name = "core/graph/di_edge" - version = "1.0.0" + version = "0.1.0" types = [DiEdge] def to_yaml_tree(self, obj: DiEdge, tag: str, ctx) -> dict: @@ -49,7 +49,7 @@ class DiNodeConverter(WeldxConverter): """ASDF type for `DiNode`.""" name = "core/graph/di_node" - version = "1.0.0" + version = "0.1.0" types = [DiNode] def to_yaml_tree(self, obj: DiNode, tag: str, ctx) -> dict: @@ -150,7 +150,7 @@ class DiGraphConverter(WeldxConverter): """Serialization class for `networkx.DiGraph`.""" name = "core/graph/di_graph" - version = "1.0.0" + version = "0.1.0" types = [nx.DiGraph] def to_yaml_tree(self, obj: nx.DiGraph, tag: str, ctx) -> dict: diff --git a/weldx/tags/core/mathematical_expression.py b/weldx/tags/core/mathematical_expression.py index b4b592ee4..7da76535a 100644 --- a/weldx/tags/core/mathematical_expression.py +++ b/weldx/tags/core/mathematical_expression.py @@ -10,7 +10,7 @@ class MathematicalExpressionConverter(WeldxConverter): """Serialization class for sympy style math expressions.""" name = "core/mathematical_expression" - version = "1.0.0" + version = "0.1.0" types = [MathematicalExpression] def to_yaml_tree(self, obj: MathematicalExpression, tag: str, ctx) -> dict: diff --git a/weldx/tags/core/time_series.py b/weldx/tags/core/time_series.py index fa7eff2d5..f9ba7da47 100644 --- a/weldx/tags/core/time_series.py +++ b/weldx/tags/core/time_series.py @@ -14,7 +14,7 @@ class TimeSeriesConverter(WeldxConverter): """Serialization class for weldx.core.TimeSeries""" name = "core/time_series" - version = "1.0.0" + version = "0.1.0" types = [TimeSeries] def to_yaml_tree(self, obj: TimeSeries, tag: str, ctx) -> dict: diff --git a/weldx/tags/core/transformations/_legacy/coordinate_system_hierarchy.py b/weldx/tags/core/transformations/_legacy/coordinate_system_hierarchy.py index 284a44cf0..62e78181d 100644 --- a/weldx/tags/core/transformations/_legacy/coordinate_system_hierarchy.py +++ b/weldx/tags/core/transformations/_legacy/coordinate_system_hierarchy.py @@ -21,7 +21,7 @@ class CoordinateTransformationConverter(WeldxConverter): """Legacy serialization class for CoordinateTransformation""" tags = [ - "tag:weldx.bam.de:weldx/core/transformations/coordinate_transformation-1.0.0" + "tag:weldx.bam.de:weldx/core/transformations/coordinate_transformation-0.1.*" ] types = [CoordinateTransformation] @@ -65,7 +65,7 @@ class CoordinateSystemManagerSubsystemConverter(WeldxConverter): tags = [ "tag:weldx.bam.de:weldx/core/transformations/" - "coordinate_system_hierarchy_subsystem-1.0.0" + "coordinate_system_hierarchy_subsystem-0.1.*" ] types = [CoordinateSystemManagerSubsystem] @@ -96,7 +96,7 @@ class CoordinateSystemManagerConverter(WeldxConverter): """Legacy serialization class for weldx.transformations.CoordinateSystemManager""" tags = [ - "tag:weldx.bam.de:weldx/core/transformations/coordinate_system_hierarchy-1.0.0" + "tag:weldx.bam.de:weldx/core/transformations/coordinate_system_hierarchy-0.1.*" ] types = [_CoordinateSystemManager] diff --git a/weldx/tags/core/transformations/coordinate_system_hierarchy.py b/weldx/tags/core/transformations/coordinate_system_hierarchy.py index bb1e3237b..461477d34 100644 --- a/weldx/tags/core/transformations/coordinate_system_hierarchy.py +++ b/weldx/tags/core/transformations/coordinate_system_hierarchy.py @@ -7,7 +7,7 @@ class CoordinateSystemManagerConverter(WeldxConverter): tags = [ "asdf://weldx.bam.de/weldx/tags/core/transformations/" - "coordinate_system_hierarchy-1.0.0" + "coordinate_system_hierarchy-0.1.*" ] types = [CoordinateSystemManager] diff --git a/weldx/tags/core/transformations/local_coordinate_system.py b/weldx/tags/core/transformations/local_coordinate_system.py index 3f36676a4..95ed41f4b 100644 --- a/weldx/tags/core/transformations/local_coordinate_system.py +++ b/weldx/tags/core/transformations/local_coordinate_system.py @@ -8,7 +8,7 @@ class LocalCoordinateSystemConverter(WeldxConverter): """Serialization class for weldx.transformations.LocalCoordinateSystem""" name = "core/transformations/local_coordinate_system" - version = "1.0.0" + version = "0.1.0" types = [LocalCoordinateSystem] def to_yaml_tree(self, obj: LocalCoordinateSystem, tag: str, ctx) -> dict: diff --git a/weldx/tags/core/transformations/rotation.py b/weldx/tags/core/transformations/rotation.py index 560857bcc..1dc8fc03d 100644 --- a/weldx/tags/core/transformations/rotation.py +++ b/weldx/tags/core/transformations/rotation.py @@ -10,7 +10,7 @@ class WXRotationConverter(WeldxConverter): """Serialization class for the 'Scipy.Rotation' type""" name = "core/transformations/rotation" - version = "1.0.0" + version = "0.1.0" types = [Rotation, WXRotation] def to_yaml_tree(self, obj: Rotation, tag: str, ctx) -> dict: diff --git a/weldx/tags/debug/test_property_tag.py b/weldx/tags/debug/test_property_tag.py index 17d374c3d..4eda35d12 100644 --- a/weldx/tags/debug/test_property_tag.py +++ b/weldx/tags/debug/test_property_tag.py @@ -19,5 +19,5 @@ class PropertyTagTestClass: PropertyTagTestClassConverter = dataclass_serialization_class( class_type=PropertyTagTestClass, class_name="debug/test_property_tag", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/debug/test_shape_validator.py b/weldx/tags/debug/test_shape_validator.py index 4ad2e3742..3b766a9b6 100644 --- a/weldx/tags/debug/test_shape_validator.py +++ b/weldx/tags/debug/test_shape_validator.py @@ -34,5 +34,5 @@ class ShapeValidatorTestClass: ShapeValidatorTestClassConverter = dataclass_serialization_class( class_type=ShapeValidatorTestClass, class_name="debug/test_shape_validator", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/debug/test_unit_validator.py b/weldx/tags/debug/test_unit_validator.py index f8f81d6c8..c4b79eb09 100644 --- a/weldx/tags/debug/test_unit_validator.py +++ b/weldx/tags/debug/test_unit_validator.py @@ -25,5 +25,5 @@ class UnitValidatorTestClass: UnitValidatorTestClassConverter = dataclass_serialization_class( class_type=UnitValidatorTestClass, class_name="debug/test_unit_validator", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/equipment/measurement_equipment.py b/weldx/tags/equipment/measurement_equipment.py index df43009d7..a5d1e251a 100644 --- a/weldx/tags/equipment/measurement_equipment.py +++ b/weldx/tags/equipment/measurement_equipment.py @@ -13,6 +13,6 @@ def _from_yaml_tree_mod(tree): MeasurementEquipmentConverter = dataclass_serialization_class( class_type=MeasurementEquipment, class_name="equipment/measurement_equipment", - version="1.0.0", + version="0.1.0", from_yaml_tree_mod=_from_yaml_tree_mod, ) diff --git a/weldx/tags/groove/iso_9692_1.py b/weldx/tags/groove/iso_9692_1.py index 1dbb5888c..d06c6c8d8 100644 --- a/weldx/tags/groove/iso_9692_1.py +++ b/weldx/tags/groove/iso_9692_1.py @@ -20,7 +20,7 @@ class IsoGrooveConverter(WeldxConverter): """ASDF Groove type.""" tags = [ - format_tag(tag_name=_ISO_GROOVE_SCHEMA + g, version="1.*") + format_tag(tag_name=_ISO_GROOVE_SCHEMA + g, version="0.1.*") for g in _groove_name_to_type.keys() ] types = IsoBaseGroove.__subclasses__() diff --git a/weldx/tags/measurement/error.py b/weldx/tags/measurement/error.py index 0a6defbc4..bafeff7e7 100644 --- a/weldx/tags/measurement/error.py +++ b/weldx/tags/measurement/error.py @@ -5,5 +5,5 @@ ErrorConverter = dataclass_serialization_class( - class_type=Error, class_name="measurement/error", version="1.0.0" + class_type=Error, class_name="measurement/error", version="0.1.0" ) diff --git a/weldx/tags/measurement/measurement.py b/weldx/tags/measurement/measurement.py index 26b3ced9b..a09cdc5a8 100644 --- a/weldx/tags/measurement/measurement.py +++ b/weldx/tags/measurement/measurement.py @@ -5,5 +5,5 @@ MeasurementConverter = dataclass_serialization_class( - class_type=Measurement, class_name="measurement/measurement", version="1.0.0" + class_type=Measurement, class_name="measurement/measurement", version="0.1.0" ) diff --git a/weldx/tags/measurement/measurement_chain.py b/weldx/tags/measurement/measurement_chain.py index 81ced19d9..ec3f0c058 100644 --- a/weldx/tags/measurement/measurement_chain.py +++ b/weldx/tags/measurement/measurement_chain.py @@ -11,7 +11,7 @@ class MeasurementChainConverter(WeldxConverter): """Serialization class for measurement chains""" name = "measurement/measurement_chain" - version = "1.0.0" + version = "0.1.0" types = [MeasurementChain] def to_yaml_tree(self, obj: MeasurementChain, tag: str, ctx) -> dict: diff --git a/weldx/tags/measurement/signal.py b/weldx/tags/measurement/signal.py index a3be96c67..ead74071c 100644 --- a/weldx/tags/measurement/signal.py +++ b/weldx/tags/measurement/signal.py @@ -13,6 +13,6 @@ def _from_yaml_tree_mod(tree): SignalConverter = dataclass_serialization_class( class_type=Signal, class_name="measurement/signal", - version="1.0.0", + version="0.1.0", from_yaml_tree_mod=_from_yaml_tree_mod, ) diff --git a/weldx/tags/measurement/signal_transformation.py b/weldx/tags/measurement/signal_transformation.py index 3e9517557..582529d06 100644 --- a/weldx/tags/measurement/signal_transformation.py +++ b/weldx/tags/measurement/signal_transformation.py @@ -7,5 +7,5 @@ SignalTransformationConverter = dataclass_serialization_class( class_type=SignalTransformation, class_name="measurement/signal_transformation", - version="1.0.0", + version="0.1.0", ) diff --git a/weldx/tags/measurement/source.py b/weldx/tags/measurement/source.py index 4427b7fbd..a396f80d3 100644 --- a/weldx/tags/measurement/source.py +++ b/weldx/tags/measurement/source.py @@ -5,5 +5,5 @@ SignalSourceConverter = dataclass_serialization_class( - class_type=SignalSource, class_name="measurement/source", version="1.0.0" + class_type=SignalSource, class_name="measurement/source", version="0.1.0" ) diff --git a/weldx/tags/processes/process.py b/weldx/tags/processes/process.py index adc37b7d0..c7d18fbc6 100644 --- a/weldx/tags/processes/process.py +++ b/weldx/tags/processes/process.py @@ -1,6 +1,7 @@ """Welding process ASDF classes.""" from weldx.asdf.types import WeldxConverter, format_tag +from weldx.asdf.util import uri_match from weldx.welding.processes import GmawProcess __all__ = ["GmawProcessConverter"] @@ -10,9 +11,9 @@ class GmawProcessConverter(WeldxConverter): """Custom serialization class for GmawProcess.""" tags = [ - "asdf://weldx.bam.de/weldx/tags/process/GMAW-1.0.0", - "asdf://weldx.bam.de/weldx/tags/process/CLOOS/spray_arc-1.0.0", - "asdf://weldx.bam.de/weldx/tags/process/CLOOS/pulse-1.0.0", + "asdf://weldx.bam.de/weldx/tags/process/GMAW-0.1.*", + "asdf://weldx.bam.de/weldx/tags/process/CLOOS/spray_arc-0.1.*", + "asdf://weldx.bam.de/weldx/tags/process/CLOOS/pulse-0.1.*", ] types = [GmawProcess] @@ -26,7 +27,7 @@ def from_yaml_tree(self, node: dict, tag: str, ctx): def select_tag(self, obj: GmawProcess, tags, ctx): """Select new style tag according to groove name.""" - tag = format_tag(tag_name="process/" + obj.tag, version="1.0.0") - if tag not in self.tags: + tag = format_tag(tag_name="process/" + obj.tag, version="0.1.0") + if not uri_match(patterns=self.tags, uri=tag): raise ValueError("The generated process tag is not supported") return tag diff --git a/weldx/tags/time/datetimeindex.py b/weldx/tags/time/datetimeindex.py index e19769fc1..816578738 100644 --- a/weldx/tags/time/datetimeindex.py +++ b/weldx/tags/time/datetimeindex.py @@ -13,7 +13,7 @@ class DatetimeIndexConverter(WeldxConverter): """A simple implementation of serializing pandas DatetimeIndex.""" name = "time/datetimeindex" - version = "1.0.0" + version = "0.1.0" types = [pd.DatetimeIndex] def to_yaml_tree(self, obj: pd.DatetimeIndex, tag: str, ctx) -> dict: diff --git a/weldx/tags/time/time.py b/weldx/tags/time/time.py index 991d776e0..357547a40 100644 --- a/weldx/tags/time/time.py +++ b/weldx/tags/time/time.py @@ -8,7 +8,7 @@ class TimeConverter(WeldxConverter): """A simple implementation of serializing a Time instance.""" name = "time/time" - version = "1.0.0" + version = "0.1.0" types = [Time] def to_yaml_tree(self, obj: Time, tag: str, ctx) -> dict: diff --git a/weldx/tags/time/timedelta.py b/weldx/tags/time/timedelta.py index 9d44991bb..c0a99499c 100644 --- a/weldx/tags/time/timedelta.py +++ b/weldx/tags/time/timedelta.py @@ -8,7 +8,7 @@ class TimedeltaConverter(WeldxConverter): """A simple implementation of serializing a single pandas Timedelta.""" - tags = ["asdf://weldx.bam.de/weldx/tags/time/timedelta-1.*"] + tags = ["asdf://weldx.bam.de/weldx/tags/time/timedelta-0.1.*"] types = [pd.Timedelta] def to_yaml_tree(self, obj: pd.Timedelta, tag, ctx) -> dict: diff --git a/weldx/tags/time/timedeltaindex.py b/weldx/tags/time/timedeltaindex.py index 5511c12bf..95b166626 100644 --- a/weldx/tags/time/timedeltaindex.py +++ b/weldx/tags/time/timedeltaindex.py @@ -13,7 +13,7 @@ class TimedeltaIndexConverter(WeldxConverter): """A simple implementation of serializing pandas TimedeltaIndex.""" name = "time/timedeltaindex" - version = "1.0.0" + version = "0.1.0" types = [pd.TimedeltaIndex] def to_yaml_tree(self, obj: pd.TimedeltaIndex, tag: str, ctx) -> dict: diff --git a/weldx/tags/time/timestamp.py b/weldx/tags/time/timestamp.py index a78f308e8..7992699ad 100644 --- a/weldx/tags/time/timestamp.py +++ b/weldx/tags/time/timestamp.py @@ -9,7 +9,7 @@ class TimestampConverter(WeldxConverter): """A simple implementation of serializing a single pandas Timestamp.""" name = "time/timestamp" - version = "1.0.0" + version = "0.1.0" types = [pd.Timestamp] def to_yaml_tree(self, obj: pd.Timestamp, tag: str, ctx) -> dict: diff --git a/weldx/tags/unit/pint_quantity.py b/weldx/tags/unit/pint_quantity.py index d65190ea7..b2b9468ec 100644 --- a/weldx/tags/unit/pint_quantity.py +++ b/weldx/tags/unit/pint_quantity.py @@ -12,7 +12,7 @@ class PintQuantityConverter(WeldxConverter): """A simple implementation of serializing a pint quantity as asdf quantity.""" tags = [ - "asdf://weldx.bam.de/weldx/tags/unit/quantity-1.*", + "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*", "tag:stsci.edu:asdf/unit/quantity-1.*", ] types = [ @@ -45,7 +45,7 @@ def shape_from_tagged(node: TaggedDict) -> List[int]: class PintUnitConverter(WeldxConverter): """A simple implementation of serializing a pint unit as tagged asdf node.""" - tags = ["asdf://weldx.bam.de/weldx/tags/unit/unit-1.*"] + tags = ["asdf://weldx.bam.de/weldx/tags/unit/unit-0.1.*"] types = ["pint.unit.build_unit_class..Unit"] def to_yaml_tree(self, obj: pint.Unit, tag: str, ctx) -> str: diff --git a/weldx/tests/asdf_tests/test_asdf_util.py b/weldx/tests/asdf_tests/test_asdf_util.py index b3122d5c1..4b70dd5e6 100644 --- a/weldx/tests/asdf_tests/test_asdf_util.py +++ b/weldx/tests/asdf_tests/test_asdf_util.py @@ -129,7 +129,7 @@ class _DataClass: dataclass_asdf = dataclass_serialization_class( class_type=_DataClass, class_name="Test", - version="1.0.0", + version="0.1.0", sort_string_lists=sort_string_lists, to_yaml_tree_mod=to_yaml_tree_mod, from_yaml_tree_mod=from_yaml_tree_mod, @@ -161,9 +161,9 @@ def test_get_highest_tag_version(): """Test getting some tags from the WeldxExtension.""" assert ( get_highest_tag_version("asdf://weldx.bam.de/weldx/tags/uuid-*") - == "asdf://weldx.bam.de/weldx/tags/uuid-1.0.0" + == "asdf://weldx.bam.de/weldx/tags/uuid-0.1.0" ) - assert get_highest_tag_version("asdf://weldx.bam.de/weldx/tags/uuid-2.*") is None + assert get_highest_tag_version("asdf://weldx.bam.de/weldx/tags/uuid-1.*") is None with pytest.raises(ValueError): get_highest_tag_version("asdf://weldx.bam.de/weldx/tags/**-*") diff --git a/weldx/tests/asdf_tests/test_weldx_file.py b/weldx/tests/asdf_tests/test_weldx_file.py index d46599767..dfb31ae99 100644 --- a/weldx/tests/asdf_tests/test_weldx_file.py +++ b/weldx/tests/asdf_tests/test_weldx_file.py @@ -17,6 +17,8 @@ from weldx.types import SupportsFileReadWrite from weldx.util import compare_nested +SINGLE_PASS_SCHEMA = "single_pass_weld-0.1.0" + class ReadOnlyFile: """Simulate a read-only file.""" @@ -303,7 +305,7 @@ def test_history(self): def test_custom_schema(schema_arg): """Check the property complex_schema is being set.""" buff, _ = single_pass_weld_example(None) - schema = get_schema_path("datamodels/single_pass_weld-1.0.0.yaml") + schema = get_schema_path("datamodels/single_pass_weld-0.1.0.yaml") kwargs = {schema_arg: schema} if schema_arg == "asdffile_kwargs": kwargs = {"asdffile_kwargs": {"custom_schema": schema}} @@ -314,7 +316,7 @@ def test_custom_schema(schema_arg): @staticmethod def test_custom_schema_resolve_path(): """Schema paths should be resolved internally.""" - schema = "single_pass_weld-1.0.0" + schema = SINGLE_PASS_SCHEMA with pytest.raises(ValidationError) as e: WeldxFile(custom_schema=schema) assert "required property" in e.value.message @@ -328,8 +330,8 @@ def test_custom_schema_not_existent(): @staticmethod def test_custom_schema_real_file(tmpdir): """Passing real paths.""" - assert not pathlib.Path("single_pass_weld-1.0.0").exists() - shutil.copy(get_schema_path("single_pass_weld-1.0.0"), ".") + assert not pathlib.Path(SINGLE_PASS_SCHEMA).exists() + shutil.copy(get_schema_path(SINGLE_PASS_SCHEMA), ".") with pytest.raises(ValueError): WeldxFile(custom_schema="no") diff --git a/weldx/tests/transformations/test_cs_manager.py b/weldx/tests/transformations/test_cs_manager.py index f6cc646de..40dce1285 100644 --- a/weldx/tests/transformations/test_cs_manager.py +++ b/weldx/tests/transformations/test_cs_manager.py @@ -1818,6 +1818,7 @@ def test_remove_subsystems(list_of_csm_and_lcs_instances, nested): ], ) @pytest.mark.slow +@pytest.mark.filterwarnings("ignore:The following coordinate systems.*:UserWarning") def test_unmerge_merged_serially(list_of_csm_and_lcs_instances, additional_cs): """Test the CSM unmerge function.