From a617b06eb3e6b30ae70969812991e253b21d7333 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Mon, 7 Nov 2022 11:59:09 +0100 Subject: [PATCH] v0.6.2 (#822) * prepare 0.6.2 * fix mypy * update CITATION.cff * add toml dep in isort pre-commit * fix deepsource issues * get_groove: remove internal links --- .pre-commit-config.yaml | 3 +- CHANGELOG.rst | 4 ++- CITATION.cff | 4 +-- RELEASE.md | 2 +- weldx/core/generic_series.py | 11 +++++-- weldx/welding/groove/iso_9692_1.py | 52 ++++++++---------------------- 6 files changed, 30 insertions(+), 46 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da06a08ac..a2c2eff70 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$' @@ -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/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..47beb7fad 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-07 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 diff --git a/weldx/core/generic_series.py b/weldx/core/generic_series.py index b9f6ae0d5..2378084b1 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], @@ -314,7 +318,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], @@ -775,9 +779,10 @@ def __add__(self, other): return NotImplemented @staticmethod - # skipcq: PYL-W0613 def interp_like( - obj: Any, dimensions: list[str] = None, accessor_mappings: dict = None + 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. diff --git a/weldx/welding/groove/iso_9692_1.py b/weldx/welding/groove/iso_9692_1.py index b0c3dbe1d..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: - - VGroove_ - - UGroove_ - - IGroove_ - - UVGroove_ - - VVGroove_ - - HVGroove_ - - HUGroove_ - - DVGroove_ - - DUGroove_ - - DHVGroove_ - - DHUGroove_ - - 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: - .. _IGroove: - 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. - .. _VGroove: - 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. - .. _UGroove: - 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. - .. _UVGroove: - 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. - .. _VVGroove: - 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. - .. _HVGroove: - 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. - .. _HUGroove: - 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. - .. _DVGroove: - 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. - .. _DUGroove: - 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. - .. _DHVGroove: - DHVGroove: - This is a special case of the DVGroove_. 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. - .. _DHUGroove: - DHUGroove: - This is a special case of the DUGroove_. + This is a special case of the DUGroove. The parameters remain the same. - .. _FFGroove: - FFGroove: These grooves are identified by their code number. These correspond to the key figure numbers from the standard. For more information, see the