diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6a8ab52e..76bac9ce 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.1 +current_version = 2.0.2 files = strax/__init__.py docs/source/conf.py commit = True tag = True diff --git a/HISTORY.md b/HISTORY.md index a08dfef1..29c835c1 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,12 @@ +2.0.2 / 2024-11-19 +--------------------- +* Raise error when peaks overlapping in `merge_peaks` by @dachengx in https://github.com/AxFoundation/strax/pull/927 +* Print progress bar in `dry_load_files` by @dachengx in https://github.com/AxFoundation/strax/pull/928 +* Fix a small bug in `merge_arrs` by @dachengx in https://github.com/AxFoundation/strax/pull/930 + +**Full Changelog**: https://github.com/AxFoundation/strax/compare/v2.0.1...v2.0.2 + + 2.0.1 / 2024-11-14 --------------------- * Allow `chunk_number` to be list or tuple in `dry_load_files` function by @dachengx in https://github.com/AxFoundation/strax/pull/921 diff --git a/docs/source/conf.py b/docs/source/conf.py index 4be864df..d67f6465 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -66,9 +66,9 @@ # built documents. # # The short X.Y version. -version = "2.0.1" +version = "2.0.2" # The full version, including alpha/beta/rc tags. -release = "2.0.1" +release = "2.0.2" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pyproject.toml b/pyproject.toml index 1e25d150..b1e4d23a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool] [tool.poetry] name = "strax" -version = "2.0.1" +version = "2.0.2" description = "Streaming analysis for xenon TPCs" readme = "README.md" authors = [ diff --git a/strax/__init__.py b/strax/__init__.py index 6b22aa46..77e64654 100644 --- a/strax/__init__.py +++ b/strax/__init__.py @@ -1,5 +1,5 @@ # flake8: noqa -__version__ = "2.0.1" +__version__ = "2.0.2" # Glue the package together # See https://www.youtube.com/watch?v=0oTh1CXRaQ0 if this confuses you