From ebfe95edbde3d691bed83fd638c0e149acac5091 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:04:39 +0100 Subject: [PATCH 1/8] prepare 0.6.2 --- .pre-commit-config.yaml | 2 +- CHANGELOG.rst | 4 +++- CITATION.cff | 4 ++-- RELEASE.md | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da06a08ac..011c99846 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ ci: for more information, see https://pre-commit.ci autofix_prs: false autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate' - autoupdate_schedule: weekly + autoupdate_schedule: monthly skip: [] submodules: false exclude: '.*.weldx$|.*.wx$|.*.asdf$' diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a07353e3f..8493ef186 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,9 +3,11 @@ ############### ******************** - 0.6.2 (tba) + 0.6.2 (07.11.2022) ******************** +Release ``0.6.2`` comes with new and updated tutorials and some minor fixes and code improvements. + added ===== diff --git a/CITATION.cff b/CITATION.cff index af43ee271..281367254 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,8 +1,8 @@ # YAML 1.2 --- title: weldx -version: 0.6.1 -date-released: 2022-05-19 +version: 0.6.2 +date-released: 2022-11-04 authors: - affiliation: "Bundesanstalt für Materialforschung und -prüfung (BAM)" email: cagtay.fabry@bam.de diff --git a/RELEASE.md b/RELEASE.md index 6b17cfd07..f2baaea9a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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.rst` 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 From 2758a00aca0882ec125ecf9d9cbfe9e47721b64b Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:05:02 +0100 Subject: [PATCH 2/8] fix mypy --- weldx/core/generic_series.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weldx/core/generic_series.py b/weldx/core/generic_series.py index b9f6ae0d5..4743439bb 100644 --- a/weldx/core/generic_series.py +++ b/weldx/core/generic_series.py @@ -314,7 +314,7 @@ def _init_get_updated_units( def _init_expression( self, - expr: Union[str, MathematicalExpression], + expr: Union[str, MathematicalExpression, sympy.Expr], dims: dict[str, str], parameters: dict[str, Union[str, pint.Quantity, xr.DataArray]], units: dict[str, pint.Unit], From 380909012841d5c898e0d3564b6a7d38390ee103 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:10:36 +0100 Subject: [PATCH 3/8] update CITATION.cff --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 281367254..47beb7fad 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ --- title: weldx version: 0.6.2 -date-released: 2022-11-04 +date-released: 2022-11-07 authors: - affiliation: "Bundesanstalt für Materialforschung und -prüfung (BAM)" email: cagtay.fabry@bam.de From b773f6d2f9e982dc97e372db02f0cc1b63d02a24 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:41:22 +0100 Subject: [PATCH 4/8] add toml dep in isort pre-commit --- .pre-commit-config.yaml | 1 + weldx/core/generic_series.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 011c99846..a2c2eff70 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,6 +41,7 @@ repos: rev: 5.10.1 hooks: - id: isort + additional_dependencies: ["toml"] - repo: https://github.com/PyCQA/flake8 rev: 5.0.4 hooks: diff --git a/weldx/core/generic_series.py b/weldx/core/generic_series.py index 4743439bb..74ac1822d 100644 --- a/weldx/core/generic_series.py +++ b/weldx/core/generic_series.py @@ -259,6 +259,10 @@ def __eq__(self, other): return False return self.data_array.identical(other._obj) + def __hash__(self): + """Implement as not hashable.""" + return None + def _init_discrete( self, data: Union[pint.Quantity, xr.DataArray], @@ -775,8 +779,7 @@ def __add__(self, other): return NotImplemented @staticmethod - # skipcq: PYL-W0613 - def interp_like( + def interp_like( # skipcq: PYL-W0613 obj: Any, dimensions: list[str] = None, accessor_mappings: dict = None ) -> GenericSeries: """Interpolate using the coordinates of another object. From 3535791f379354787732d151d594b71d0455a720 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:47:20 +0100 Subject: [PATCH 5/8] deepsource --- weldx/core/generic_series.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/weldx/core/generic_series.py b/weldx/core/generic_series.py index 74ac1822d..2378084b1 100644 --- a/weldx/core/generic_series.py +++ b/weldx/core/generic_series.py @@ -779,8 +779,10 @@ def __add__(self, other): return NotImplemented @staticmethod - def interp_like( # skipcq: PYL-W0613 - obj: Any, dimensions: list[str] = None, accessor_mappings: dict = None + def interp_like( + obj: Any, # skipcq: PYL-W0613 + dimensions: list[str] = None, # skipcq: PYL-W0613 + accessor_mappings: dict = None, # skipcq: PYL-W0613 ) -> GenericSeries: """Interpolate using the coordinates of another object. From dc0a1940dd5118a81841772d838111eef75207ef Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Fri, 4 Nov 2022 18:28:40 +0100 Subject: [PATCH 6/8] remove UGroove label --- weldx/welding/groove/iso_9692_1.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/weldx/welding/groove/iso_9692_1.py b/weldx/welding/groove/iso_9692_1.py index b0c3dbe1d..397e1eaba 100644 --- a/weldx/welding/groove/iso_9692_1.py +++ b/weldx/welding/groove/iso_9692_1.py @@ -1785,8 +1785,6 @@ def get_groove( The root face is the length of the Y-Groove which is not part of the V. It can be 0. - .. _UGroove: - UGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". From 5824161fa1155508fe33e68ba35058c58d2684f8 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Sat, 5 Nov 2022 21:54:45 +0100 Subject: [PATCH 7/8] change internal link names --- weldx/welding/groove/iso_9692_1.py | 50 ++++++++++++++++-------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/weldx/welding/groove/iso_9692_1.py b/weldx/welding/groove/iso_9692_1.py index 397e1eaba..436960edb 100644 --- a/weldx/welding/groove/iso_9692_1.py +++ b/weldx/welding/groove/iso_9692_1.py @@ -1678,17 +1678,17 @@ def get_groove( groove_type : String specifying the Groove type: - - VGroove_ - - UGroove_ - - IGroove_ - - UVGroove_ - - VVGroove_ - - HVGroove_ - - HUGroove_ - - DVGroove_ - - DUGroove_ - - DHVGroove_ - - DHUGroove_ + - VGrooveLNK_ + - UGrooveLNK_ + - IGrooveLNK_ + - UVGrooveLNK_ + - VVGrooveLNK_ + - HVGrooveLNK_ + - HUGrooveLNK_ + - DVGrooveLNK_ + - DUGrooveLNK_ + - DHVGrooveLNK_ + - DHUGrooveLNK_ - FFGroove_ workpiece_thickness : workpiece thickness (Default value = None) @@ -1759,7 +1759,7 @@ def get_groove( are in Quantity values from pint and related units are accepted. Required Groove attributes: - .. _IGroove: + .. _IGrooveLNK: IGroove: t: workpiece_thickness @@ -1769,7 +1769,7 @@ def get_groove( The root gap is the distance of the 2 workpieces. It can be 0 or None. - .. _VGroove: + .. _VGrooveLNK: VGroove: t: workpiece_thickness @@ -1785,6 +1785,8 @@ def get_groove( The root face is the length of the Y-Groove which is not part of the V. It can be 0. + .. _UGrooveLNK: + UGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1802,7 +1804,7 @@ def get_groove( c: root_face The root face is the height of the part below the U-segment. - .. _UVGroove: + .. _UVGrooveLNK: UVGroove: t: workpiece_thickness @@ -1824,7 +1826,7 @@ def get_groove( h: root_face The root face is the height of the V-segment. - .. _VVGroove: + .. _VVGrooveLNK: VVGroove: t: workpiece_thickness @@ -1846,7 +1848,7 @@ def get_groove( This root face is the height of the part of the lower V-segment and the root face c. - .. _HVGroove: + .. _HVGrooveLNK: HVGroove: t: workpiece_thickness @@ -1861,7 +1863,7 @@ def get_groove( c: root_face The root face is the height of the part below the V-segment. - .. _HUGroove: + .. _HUGrooveLNK: HUGroove: t: workpiece_thickness @@ -1880,7 +1882,7 @@ def get_groove( c: root_face The root face is the height of the part below the U-segment. - .. _DVGroove: + .. _DVGrooveLNK: DVGroove: t: workpiece_thickness @@ -1904,7 +1906,7 @@ def get_groove( The root face is the height of the lower V-segment. Only c is needed. - .. _DUGroove: + .. _DUGrooveLNK: DUGroove: t: workpiece_thickness @@ -1936,21 +1938,21 @@ def get_groove( The root face is the height of the lower U-segment. Only c is needed. - .. _DHVGroove: + .. _DHVGrooveLNK: DHVGroove: - This is a special case of the DVGroove_. The values of the angles are + This is a special case of the DVGrooveLNK_. The values of the angles are interpreted here as bevel angel. So you have only half of the size. Accordingly the inputs beta1 (bevel angle) and beta2 (bevel angle 2) are used. - .. _DHUGroove: + .. _DHUGrooveLNK: DHUGroove: - This is a special case of the DUGroove_. + This is a special case of the DUGrooveLNK_. The parameters remain the same. - .. _FFGroove: + .. _FFGrooveLNK: FFGroove: These grooves are identified by their code number. These correspond to the From f13a0bc63967d3a92974e043232e311c94bff1a2 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Sat, 5 Nov 2022 22:22:19 +0100 Subject: [PATCH 8/8] remove links --- weldx/welding/groove/iso_9692_1.py | 52 ++++++++---------------------- 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/weldx/welding/groove/iso_9692_1.py b/weldx/welding/groove/iso_9692_1.py index 436960edb..0442ccf13 100644 --- a/weldx/welding/groove/iso_9692_1.py +++ b/weldx/welding/groove/iso_9692_1.py @@ -1678,18 +1678,18 @@ def get_groove( groove_type : String specifying the Groove type: - - VGrooveLNK_ - - UGrooveLNK_ - - IGrooveLNK_ - - UVGrooveLNK_ - - VVGrooveLNK_ - - HVGrooveLNK_ - - HUGrooveLNK_ - - DVGrooveLNK_ - - DUGrooveLNK_ - - DHVGrooveLNK_ - - DHUGrooveLNK_ - - FFGroove_ + - VGroove + - UGroove + - IGroove + - UVGroove + - VVGroove + - HVGroove + - HUGroove + - DVGroove + - DUGroove + - DHVGroove + - DHUGroove + - FFGroove workpiece_thickness : workpiece thickness (Default value = None) workpiece_thickness2 : @@ -1759,8 +1759,6 @@ def get_groove( are in Quantity values from pint and related units are accepted. Required Groove attributes: - .. _IGrooveLNK: - IGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1769,8 +1767,6 @@ def get_groove( The root gap is the distance of the 2 workpieces. It can be 0 or None. - .. _VGrooveLNK: - VGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1785,8 +1781,6 @@ def get_groove( The root face is the length of the Y-Groove which is not part of the V. It can be 0. - .. _UGrooveLNK: - UGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1804,8 +1798,6 @@ def get_groove( c: root_face The root face is the height of the part below the U-segment. - .. _UVGrooveLNK: - UVGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1826,8 +1818,6 @@ def get_groove( h: root_face The root face is the height of the V-segment. - .. _VVGrooveLNK: - VVGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1848,8 +1838,6 @@ def get_groove( This root face is the height of the part of the lower V-segment and the root face c. - .. _HVGrooveLNK: - HVGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1863,8 +1851,6 @@ def get_groove( c: root_face The root face is the height of the part below the V-segment. - .. _HUGrooveLNK: - HUGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1882,8 +1868,6 @@ def get_groove( c: root_face The root face is the height of the part below the U-segment. - .. _DVGrooveLNK: - DVGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1906,8 +1890,6 @@ def get_groove( The root face is the height of the lower V-segment. Only c is needed. - .. _DUGrooveLNK: - DUGroove: t: workpiece_thickness The workpiece thickness is a length Quantity, e.g.: "mm". @@ -1938,22 +1920,16 @@ def get_groove( The root face is the height of the lower U-segment. Only c is needed. - .. _DHVGrooveLNK: - DHVGroove: - This is a special case of the DVGrooveLNK_. The values of the angles are + This is a special case of the DVGroove. The values of the angles are interpreted here as bevel angel. So you have only half of the size. Accordingly the inputs beta1 (bevel angle) and beta2 (bevel angle 2) are used. - .. _DHUGrooveLNK: - DHUGroove: - This is a special case of the DUGrooveLNK_. + This is a special case of the DUGroove. The parameters remain the same. - .. _FFGrooveLNK: - FFGroove: These grooves are identified by their code number. These correspond to the key figure numbers from the standard. For more information, see the