Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.6.3 #850

Merged
merged 10 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
- name: run pytest on notebooks (append coverage)
if: matrix.py == '3.8'
run: |
pytest -n 2 --dist loadfile --nbval --current-env --cov-append tutorials/
pytest -n 2 --dist loadfile --nbval --current-env --cov-append ./doc/src/tutorials/
CagtayFabry marked this conversation as resolved.
Show resolved Hide resolved

- name: test with WeldxFile
if: matrix.py == '3.8'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repos:
hooks:
- id: black
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.233
rev: v0.0.239
hooks:
- id: ruff
args:
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Release Notes

## 0.6.3 (unreleased)
## 0.6.3 (02.02.2023)

Version `0.6.3` is a minor release to increase compatibility with Python 3.11 and `asdf 2.14`
with updates to the documentation structure and a new schema for video files.

### Added

Expand All @@ -20,6 +23,11 @@
- Use MyST-NB for documentation building \[{pull}`830`\].
- `WeldxFile` correctly determines whether to display the header via widgets or text \[{pull}`848`\].

### ASDF

- update to `asdf://weldx.bam.de/weldx/schemas/core/file-0.1.1` \[{pull}`727`\]
- add `asdf://weldx.bam.de/weldx/schemas/core/media_file-0.1.0` \[{pull}`727`\]

## 0.6.2 (07.11.2022)

Release `0.6.2` comes with new and updated tutorials and some minor fixes and code improvements.
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# YAML 1.2
---
title: weldx
version: 0.6.2
date-released: 2022-11-07
version: 0.6.3
date-released: 2023-02-02
authors:
- affiliation: "Bundesanstalt für Materialforschung und -prüfung (BAM)"
email: [email protected]
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ A short primer in the steps needed to release a new version of the `weldx` packa
- [ ] create a PR that finalizes the code for the next version
- [ ] name the PR according to the version `vX.Y.Z` and add the `release`
tag ([example here](https://github.com/BAMWelDX/weldx/pull/419))
- [ ] make sure `CHANGELOG.rst` is up-to-date and enter current date to the release version
- [ ] make sure `CHANGELOG.md` is up-to-date and enter current date to the release version
- [ ] add summarized release highlights where appropriate
- [ ] update the `CITATION.cff` version number and date
- [ ] search the project for `deprecated` and remove deprecated code
Expand All @@ -28,7 +28,7 @@ A short primer in the steps needed to release a new version of the `weldx` packa
([this website](https://mystyc.herokuapp.com/) can be used to convert rST -> MD)
- [ ] wait for all Github Actions to finish

## ReadTheDocs update
## ReadTheDocs updates

- [ ] check the build processes for `latest`, `stable` and `vX.Y.Z` get triggered on RTD (the tag build can get
triggered twice, resulting in a failed/duplicated build, no need to worry)
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ ignore_errors = true
target-version = "py38" # designated Python version
exclude = [
"__init__.py",
"doc/conf.py",
"doc/src/conf.py",
]
# TODO: should be the following list, but Ruff does not yet impl all of them.
# W503,W504
Expand Down Expand Up @@ -224,6 +224,7 @@ mccabe = {max-complexity = 15} # max branches inside a function.

[tool.ruff.isort]
known-first-party = ["weldx"]
required-imports = ["from __future__ import annotations"]

[tool.ruff.flake8-import-conventions]
extend-aliases = {xarray = "xr"}
1 change: 0 additions & 1 deletion tutorials

This file was deleted.

2 changes: 1 addition & 1 deletion weldx/asdf/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
WELDX_SCHEMA_URI_BASE = "asdf://weldx.bam.de/weldx/schemas/"
WELDX_EXTENSION_URI_BASE = "asdf://weldx.bam.de/weldx/extensions/"

WELDX_EXTENSION_VERSION = "0.1.1"
WELDX_EXTENSION_VERSION = "0.1.2"
WELDX_EXTENSION_URI = f"{WELDX_EXTENSION_URI_BASE}weldx-{WELDX_EXTENSION_VERSION}"

WELDX_MANIFEST_URI = WELDX_URI_BASE + "manifests/weldx-" + WELDX_EXTENSION_VERSION
4 changes: 0 additions & 4 deletions weldx/manifests/weldx-0.1.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ tags:
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/file-0.1.1
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/file-0.1.1
- tag_uri: asdf://weldx.bam.de/weldx/tags/core/generic_series-0.1.0
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/generic_series-0.1.0
- tag_uri: asdf://weldx.bam.de/weldx/tags/core/generic_series_free_dimension-0.1.0
Expand All @@ -55,8 +53,6 @@ tags:
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/graph/di_node-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/media_file-0.1.0
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/media_file-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/time_series-0.1.1
Expand Down
142 changes: 142 additions & 0 deletions weldx/manifests/weldx-0.1.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
%YAML 1.1
---
id: asdf://weldx.bam.de/weldx/manifests/weldx-0.1.2
extension_uri: asdf://weldx.bam.de/weldx/extensions/weldx-0.1.2
title: weldx extension manifest for tag mapping
description: Manifest listing all tag URIs with schema URIs supported by weldx
tags:
- tag_uri: tag:stsci.edu:asdf/unit/quantity-1.1.0
schema_uri: http://stsci.edu/schemas/asdf/unit/quantity-1.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/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/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/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/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/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/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/file-0.1.1
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/file-0.1.1
- tag_uri: asdf://weldx.bam.de/weldx/tags/core/generic_series-0.1.0
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/generic_series-0.1.0
- tag_uri: asdf://weldx.bam.de/weldx/tags/core/generic_series_free_dimension-0.1.0
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/generic_series_free_dimension-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/geometry/spatial_data-0.1.1
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/geometry/spatial_data-0.1.1
- 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/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/media_file-0.1.0
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/media_file-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/time_series-0.1.1
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/time_series-0.1.1
- 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/local_coordinate_system-0.1.1
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/transformations/local_coordinate_system-0.1.1
- 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/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/variable-0.1.1
schema_uri: asdf://weldx.bam.de/weldx/schemas/core/variable-0.1.1
- 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/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/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/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/units/quantity-0.1.0
schema_uri: asdf://weldx.bam.de/weldx/schemas/units/quantity-0.1.0
- tag_uri: asdf://weldx.bam.de/weldx/tags/units/units-0.1.0
schema_uri: asdf://weldx.bam.de/weldx/schemas/units/units-0.1.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
...
2 changes: 1 addition & 1 deletion weldx/transformations/cs_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

# only import heavy-weight packages on type checking
if TYPE_CHECKING: # pragma: no cover
import matplotlib
import matplotlib # noqa: ICN001
import networkx as nx


Expand Down
4 changes: 3 additions & 1 deletion weldx/transformations/local_cs.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
__all__ = ("LocalCoordinateSystem",)

if typing.TYPE_CHECKING:
import matplotlib
import matplotlib # noqa: ICN001


class LocalCoordinateSystem(TimeDependent):
Expand Down Expand Up @@ -257,6 +257,8 @@ def _comp_coords():
and self.reference_time == other.reference_time
)

__hash__ = None

@staticmethod
def _build_orientation(
orientation: types_orientation,
Expand Down