DIALS 3.17.1

Bugfixes -------- - Importing the (deprecated and removed) ``dxtbx.datablock`` module failed to display warning properly. Misc ---- - `cctbx#672 <https://github.com/cctbx/dxtbx/issues/672>`_
dials · Dec 4, 2023 · f34acce · f34acce
2 parents 286ad1f + f508235
commit f34acce
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git 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<major>\d+)\.(?P<minor>\d+)\.(?P<release>[a-z]+)?(?P<patch>\d+)?

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,18 @@
+DIALS 3.17.1 (2023-12-04)
+=========================
+
+Bugfixes
+--------
+
+- Importing the (deprecated and removed) ``dxtbx.datablock`` module failed to display warning properly. (`#665 <https://github.com/cctbx/dxtbx/issues/665>`_)
+
+
+Misc
+----
+
+- `#672 <https://github.com/cctbx/dxtbx/issues/672>`_
+
+
 dxtbx 3.17.0 (2023-11-03)
 =========================
 

diff --git 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 <major/minor/patch/release>'
-__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
@@ -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
@@ -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;
         }