diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d63f26bbb..b6151882e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.17.0 +current_version = 3.17.1 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P[a-z]+)?(?P\d+)? diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cb89dc0a5..bc89a2f7d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,18 @@ +DIALS 3.17.1 (2024-02-12) +========================= + +Bugfixes +-------- + +- Importing the (deprecated and removed) ``dxtbx.datablock`` module failed to display warning properly. (`#665 `_) + + +Misc +---- + +- `#672 `_ + + dxtbx 3.17.0 (2023-11-03) ========================= diff --git a/setup.py b/setup.py index 9827c6e2f..463844b6f 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ # Static version number which is updated by bump2version # Do not change this manually - use 'bump2version ' -__version_tag__ = "3.17.0" +__version_tag__ = "3.17.1" setup_kwargs = { "name": "dxtbx", diff --git a/src/dxtbx/datablock.py b/src/dxtbx/datablock.py index 436f52ea3..ea8d8fc3e 100644 --- a/src/dxtbx/datablock.py +++ b/src/dxtbx/datablock.py @@ -2,7 +2,7 @@ import warnings -from dxtbx.experiment_list import ( +from dxtbx.model.experiment_list import ( BeamComparison, DetectorComparison, FormatChecker, diff --git a/src/dxtbx/masking/goniometer_shadow_masking.h b/src/dxtbx/masking/goniometer_shadow_masking.h index 5c0742a01..714bad782 100644 --- a/src/dxtbx/masking/goniometer_shadow_masking.h +++ b/src/dxtbx/masking/goniometer_shadow_masking.h @@ -153,9 +153,9 @@ namespace dxtbx { namespace masking { } } if (!valid) { - std::cout << "Invalid polygon geometry (" << failure - << "): " << boost::geometry::dsv(poly) << std::endl; - std::cout << boost::geometry::dsv(points) << std::endl; + // std::cout << "Invalid polygon geometry (" << failure + // << "): " << boost::geometry::dsv(poly) << std::endl; + // std::cout << boost::geometry::dsv(points) << std::endl; result.push_back(shadow_points); continue; }