Merge branch 'master' into norm_for_each_many_vars

Author: ddkohler

.github/workflows/python-test.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: [3.11, 3.12, 3.13]
+        python-version: [3.11, 3.12, 3.13, 3.14]
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 25.1.0 # Replace by any tag/version: https://github.com/psf/black/tags
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0 # Replace by any tag/version: https://github.com/psf/black/tags
     hooks:
       - id: black
         language_version: python3 # Should be a command that runs python3.6+

CHANGELOG.md

@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [3.6.1]
+
+### Changed
+- local version identifier uses only ASCII letters/numbers and periods (PEP 440)
+- actively supporting python 3.11-3.14
+- `Data.create_constant`: allow kwargs to be passed to the constant creation
+
 ## [3.6.0]
 
 ### Added
@@ -430,8 +437,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/wright-group/WrightTools/-/compare/3.6.0...master
-[3.6.0]: https://github.com/wright-group/WrightTools/-/compare/3.5.5...3.6.0
+[Unreleased]: https://github.com/wright-group/WrightTools/-/compare/3.6.1...master
+[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
 [3.5.5]: https://github.com/wright-group/WrightTools/compare/3.5.3...3.5.5
 [3.5.4]: https://github.com/wright-group/WrightTools/compare/3.5.3...3.5.4
 [3.5.3]: https://github.com/wright-group/WrightTools/compare/3.5.2...3.5.3

WrightTools/VERSION

@@ -1 +1 @@
-3.6.0
+3.6.1

WrightTools/__version__.py

@@ -32,6 +32,9 @@
 if p.exists():
     with open(str(p)) as f:
         __branch__ = f.readline().rstrip().split(r"/")[-1]
-    __version__ += "+" + __branch__
+    # clean local verson (PEP 440)
+    __version__ += (
+        f"+{''.join(char if (char.isalnum() or char=='.') else '.' for char in __branch__)}"
+    )
 else:
     __branch__ = None

WrightTools/data/_data.py

@@ -2266,7 +2266,7 @@ def set_constants(self, *constants, verbose=True):
         self.flush()
         self._on_constants_updated()
 
-    def create_constant(self, expression, *, verbose=True):
+    def create_constant(self, expression, verbose=True, **kwargs):
         """Append a constant to the stored list.
 
         Parameters
@@ -2275,6 +2275,8 @@ def create_constant(self, expression, *, verbose=True):
             Expression for the new constant.
         verbose : boolean (optional)
             Toggle talkback. Default is True
+        **kwargs
+            extra kwargs are passed to `Constant.__init__`
 
         See Also
         --------
@@ -2286,7 +2288,7 @@ def create_constant(self, expression, *, verbose=True):
         if expression in self.constant_expressions:
             wt_exceptions.ObjectExistsWarning.warn(expression)
             return self.constants[self.constant_expressions.index(expression)]
-        constant = Constant(self, expression)
+        constant = Constant(self, expression, **kwargs)
         if constant.units is None:
             constant.convert(constant.variables[0].units)
         self._constants.append(constant)

pyproject.toml

@@ -31,6 +31,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Scientific/Engineering",
 ]
 keywords = ["spectroscopy", "science", "multidimensional", "visualization"]

tests/data/constants.py

@@ -18,6 +18,13 @@ def test_set_remove():
     assert data.constant_names == ()
 
 
+def test_units():
+    """smokescreen to make sure units can be specified for constant creation"""
+    data = wt.Data()
+    data.create_variable("y", np.ones((3,)), units="ps")
+    data.create_constant("y", units="wn")
+
+
 def test_label():
     data = wt.Data()
     data.create_variable("x", np.linspace(0, 10))