Merge branch 'master' into better-gifs

wright-group · Jul 8, 2024 · 8f99aff · 8f99aff
2 parents b64a93a + b9b18d6
commit 8f99aff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.3.0 # Replace by any tag/version: https://github.com/psf/black/tags
+    rev: 24.4.2 # 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+

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [3.5.3]
+
 ### Added
 - `Data.ichop`, an iteration-based version of `Data.chop`
 - new artist helper function: `norm_from_channel`
@@ -396,7 +398,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/wright-group/WrightTools/-/compare/3.5.2...master
+[Unreleased]: https://github.com/wright-group/WrightTools/-/compare/3.5.3...master
+[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
 [3.5.0]: https://github.com/wright-group/WrightTools/compare/3.4.6...3.5.0

diff --git a/WrightTools/VERSION b/WrightTools/VERSION
@@ -1 +1 @@
-3.5.2
+3.5.3
diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@ def read(fname):
         "pillow",
         "matplotlib>=3.4.0",
         "numexpr",
-        "numpy>=1.15.0",
+        "numpy>=1.15.0,<2.0",
         "pint",
         "python-dateutil",
         "scipy",