Merge branch 'master' into issue-1058

Author: ddkohler

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Require review from one maintainer for pushes to Development and Master
 
-* @untzag @ksunden @ddkohler @darienmorrow @kameyer226
+* @untzag @ksunden @ddkohler @darienmorrow @kameyer226 @rpm4

.github/workflows/python-publish.yml

@@ -21,11 +21,12 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install wheel twine setuptools
+        pip install twine build setuptools
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
+        twine check dist/*
         twine upload dist/*

.github/workflows/python-test.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: [3.8, 3.9, '3.10', 3.11]
+        python-version: [3.11, 3.12, 3.13]
 
     steps:
     - uses: actions/checkout@v4
@@ -25,6 +25,8 @@ jobs:
         python -m pip install --upgrade pip wheel setuptools
         python -m pip install --upgrade .[dev]
     - name: Test with pytest
+      env:
+        MPLBACKEND: "agg"
       run: |
         pytest --color=yes
 

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.4.2 # Replace by any tag/version: https://github.com/psf/black/tags
+    rev: 25.1.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+
         args: ["--line-length", "99"]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
         exclude: datasets|.data$

.readthedocs.yml

@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.9"
+    python: "3.11"
 
 python:
   install:

CHANGELOG.md

@@ -5,6 +5,43 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+## Changed
+- local version identifier uses only ASCII letters/numbers and periods (PEP 440)
+- `Data.create_constant`: allow kwargs to be passed to the constant creation
+
+## [3.6.0]
+
+### Added
+- `Data.norm_for_each`: easier norm-by-axis syntax
+- `kit.from_list_of_objects`: convenience method for grabbing an channel/variable/axis/etc. using multiple specifiers
+- `Data.get_var`: get variable object by index, name, or variable itself
+- `Data.get_axis`: get axis object by index, name, or variable itself
+- `Data.get_channel`: get channel object by index, name, or variable itself
+
+### Fixed
+- quick2D works with contours on
+- quick2D works with `pixelated=False` (i.e. contourf)
+- `data.from_LabRAM`:  small tweaks to deal with newly emerged test failure in python 3.11 tests
+
+### Changed
+- various unit tests were altered to speed up CI
+- default colorbar is sampled at 4096 points (was 256)
+- packaging now done through pyproject.toml
+
+## [3.5.5]
+
+### Fixed
+- distribution information includes dependency setuptools (fixes conda feedstock)
+
+## [3.5.4]
+
+### Fixed
+- setup.py is now configured to allow numpy 2.x
+- contour/contourf artist overloads compatible with matplotlib 3.10
+
+### Changed
+- actively supporting python 3.11-3.13
+
 ## [3.5.3]
 
 ### Added
@@ -18,7 +55,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - wt5 explore : fixed bug where data will not load interactively if directory is not cwd
 - constants in chopped data will inherit the units of the original data
 
-## Changed
+### Changed
+- numpy 2.0 compatible
 - refactor of artists.quick1D and artists.quick2D
 - quick2D and quick1D will not force `autosave=True` if the number of figures is large.  Instead, interactive plotting will be truncated if the number of figures is large.
 - artists now gets turbo colormap straight from matplotlib
@@ -396,7 +434,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/wright-group/WrightTools/-/compare/3.5.3...master
+[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
+[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
 [3.5.2]: https://github.com/wright-group/WrightTools/compare/3.5.1...3.5.2
 [3.5.1]: https://github.com/wright-group/WrightTools/compare/3.5.0...3.5.1

CONTRIBUTORS

@@ -3,12 +3,14 @@ http://wright.tools/en/stable/contributing.html
 
 Maintainers (alphabetical by last name)
   Daniel Kohler (@ddkohler)
-  Darien Morrow <darienmorrow@gmail.com> (@darienmorrow)
-  Kyle Sunden <sunden@wisc.edu> (@ksunden)
-  Blaise Thompson <blaise@untzag.com> (@untzag)
 
 Contributors (alphabetical by last name)
   Kyle Czech (@kjczech)
+  Ryan McDonnell (@rpm4)
+  Kent Meyer (@kameyer226)
+  Darien Morrow <darienmorrow@gmail.com> (@darienmorrow)
   Nathan Neff-Mallon (@neffmallon)
   Thomas Parker (@parkertomf)
+  Kyle Sunden (@ksunden)
   Rachel Swedin (@RachelSwedin)
+  Blaise Thompson <blaise@untzag.com> (@untzag)

README.rst

@@ -30,6 +30,6 @@ Documentation at `wright.tools <http://wright.tools>`_.
    :target: https://doi.org/10.21105/joss.01141
 
 .. image:: https://raw.githubusercontent.com/wright-group/WrightTools/master/logo/logo.png
-   :scale: 25 %
+   :width: 400
    :alt: WrightTools
    :align: center

WrightTools/VERSION

@@ -1 +1 @@
-3.5.3
+3.6.0

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