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.

Sign up for GitHub

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

Fix XArray LCS join #861

Merged
merged 23 commits into from
Apr 3, 2023
Merged

Fix XArray LCS join #861

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8305b06
use join method "override"
marscher Mar 27, 2023
39a2056
updated dep
marscher Mar 27, 2023
19bcf9e
amend changelog
marscher Mar 27, 2023
4120970
require at least Python 3.9
marscher Mar 27, 2023
5b8938f
py39
marscher Mar 27, 2023
f7126a5
py39
marscher Mar 27, 2023
92ed690
py39
marscher Mar 27, 2023
730b35c
tidy up pytest action
marscher Mar 27, 2023
1028028
f
marscher Mar 27, 2023
2ca02b9
f
marscher Mar 27, 2023
7ac392a
py39 in build_env
marscher Mar 27, 2023
a0cf437
fix cond
marscher Mar 27, 2023
8d33831
just plain steps
marscher Mar 27, 2023
7790d8f
mhmhm
marscher Mar 27, 2023
2b36438
undo
marscher Mar 27, 2023
ad3e682
py39
marscher Mar 27, 2023
7afbd35
f
marscher Mar 27, 2023
347f0e6
update pinning
marscher Apr 3, 2023
ee22f68
revert python 3.9 requirement for github actions
marscher Apr 3, 2023
29ea4a5
Merge branch 'master' into fix_xarray_lcs_join
marscher Apr 3, 2023
bf24a1a
revert py39
marscher Apr 3, 2023
510f9df
adjust reference time handling in xr_interp_coordinates_in_time
CagtayFabry Apr 3, 2023
2e0ea22
Merge remote-tracking branch 'marscher/fix_xarray_lcs_join' into fix_…
CagtayFabry Apr 3, 2023
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release Notes

## 0.6.5 (unreleased)

### Dependencies

- require XArray >= 2023.3.0, as `LocalCoordinateSystem` now handles merges correctly \[{pull}`861`\].

## 0.6.4 (09.02.2023)

Version `0.6.4` is a small maintenance release with no changes affecting user code.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies = [
"numpy >=1.20",
"asdf >=2.8.2,!=2.14.0,!=2.14.1,!=2.14.2",
"pandas >=1.0",
"xarray >=0.19,<2022.09.0",
"xarray >=2023.3.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually we can also think of finding the XArray version which introduced Dataset.merge(join="override"), but I found it easier to just request at least a recent version.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This XArray version dropped support for Python 3.8!
As we are at 3.11 now and 3.12 pending, we should do the same.

"scipy >=1.4,!=1.6.0,!=1.6.1",
"sympy >=1.6",
"pint >=0.18",
Expand Down
2 changes: 1 addition & 1 deletion weldx/transformations/local_cs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def __init__(
coordinates.name = "coordinates"
dataset_items.append(coordinates)

self._dataset = xr.merge(dataset_items, join="exact")
self._dataset = xr.merge(dataset_items, join="override")

self._time_ref = time_cls.reference_time if isinstance(time_cls, Time) else None
if "time" in self._dataset and self._time_ref is not None:
Expand Down