Merge branch 'master' into better-gifs

Author: ddkohler

CHANGELOG.md

@@ -5,8 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Fixed
+- `Data.squeeze`: axes of output object now inherit units from axes of the input object
+
 ### Changed
 - use `pillow` directly and remove `ImageIO` dependency
+
+## [3.6.3]
+
+### Changed
 - `Data.norm_for_each`: allow for normlization for each combination of a set of variables
 - docs use updated Sphinx packages
 - docs: new example showing norms interfacing with data objects
@@ -456,7 +463,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/wright-group/WrightTools/-/compare/3.6.2...master
+[Unreleased]: https://github.com/wright-group/WrightTools/-/compare/3.6.3...master
+[3.6.3]: https://github.com/wright-group/WrightTools/compare/3.6.2...3.6.3
 [3.6.2]: https://github.com/wright-group/WrightTools/compare/3.6.1...3.6.2
 [3.6.1]: https://github.com/wright-group/WrightTools/compare/3.6.0...3.6.1
 [3.6.0]: https://github.com/wright-group/WrightTools/compare/3.5.5...3.6.0

WrightTools/VERSION

@@ -1 +1 @@
-3.6.2
+3.6.3

WrightTools/data/_data.py

@@ -424,9 +424,12 @@ def squeeze(self, name=None, parent=None):
 
         # inherit constants
         for c in self.constants:
-            new.create_constant(c.expression)
+            new.create_constant(c.expression, verbose=False)
 
         new.transform(*self.axis_expressions)
+        for axn in self.axis_names:
+            new.get_axis(axn).convert(self.get_axis(axn).units)
+
         return new
 
     def ichop(self, *args, at=None, autoclose=True) -> Generator:

docs/conf.py

@@ -87,7 +87,7 @@
 
 # General information about the project.
 project = "WrightTools"
-copyright = "2016-2024, WrightTools Developers"
+copyright = f"2016-%Y, WrightTools Developers"
 author = "WrightTools Developers"
 
 # The version info for the project you're documenting, acts as replacement for

tests/data/squeeze.py

@@ -26,6 +26,19 @@ def test_squeeze():
     assert d.shape == (5, 4)
 
 
+def test_squeeze_units():
+    d = wt.Data(name="test")
+    d.create_variable("x", values=np.arange(5)[:, None, None], units="fs")
+    d.create_variable("y", values=np.arange(4)[None, :, None], units="fs")
+    d.create_variable("unused_var", values=d.x[:] - d.y[:], units="fs")
+    d.transform("x", "y")
+    d.convert("ps")
+
+    ds = d.squeeze(name="squeezed")
+    for axn in d.axis_names:
+        assert ds[axn].units == d[axn].units
+
+
 def test_constants():
     d = wt.Data(name="test")
     d.create_variable("x", values=np.array([1]).reshape(1, 1))
@@ -35,10 +48,9 @@ def test_constants():
     d.transform("y")
     ds = d.squeeze()
     assert "x" in ds.constant_expressions
-    d.print_tree()
-    ds.print_tree()
 
 
 if __name__ == "__main__":
     test_squeeze()
+    test_squeeze_units()
     test_constants()