From f5d14192b8fea5845d601d279061056b54a1fda9 Mon Sep 17 00:00:00 2001
From: Nicholas Devenish <ndevenish@gmail.com>
Date: Mon, 6 Nov 2023 15:25:34 +0000
Subject: [PATCH 1/4] Update removed datablock module and warning (#665)

This attempted to import some code from experiment_list before printing
the warning, but used an incorrect import path. This didn't get tested
because this was added in the commit otherwise removing datablock
completely.
---
 newsfragments/665.bugfix | 1 +
 src/dxtbx/datablock.py   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 newsfragments/665.bugfix

diff --git a/newsfragments/665.bugfix b/newsfragments/665.bugfix
new file mode 100644
index 000000000..a0a44e441
--- /dev/null
+++ b/newsfragments/665.bugfix
@@ -0,0 +1 @@
+Importing the (deprecated and removed) ``dxtbx.datablock`` module failed to display warning properly.
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,

From 822c1c11f0c83338a442166e769c3f5975e5d5d1 Mon Sep 17 00:00:00 2001
From: Nicholas Devenish <ndevenish@gmail.com>
Date: Fri, 24 Nov 2023 16:17:07 +0000
Subject: [PATCH 2/4] Temporarily remove masking geometry warnings

See #671. In some cases this has started giving (apparently harmless)
spam output. We are disabling temporarily while a workshop is running.
---
 newsfragments/672.misc                        | 1 +
 src/dxtbx/masking/goniometer_shadow_masking.h | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 newsfragments/672.misc

diff --git a/newsfragments/672.misc b/newsfragments/672.misc
new file mode 100644
index 000000000..f80db30d7
--- /dev/null
+++ b/newsfragments/672.misc
@@ -0,0 +1 @@
+Temporarily disable verbose masking geometry warning.
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;
         }

From c6f151896be96156a8fe43c0ca5ab1e416a01606 Mon Sep 17 00:00:00 2001
From: DiamondLightSource-build-server
 <DiamondLightSource-build-server@users.noreply.github.com>
Date: Mon, 12 Feb 2024 04:57:03 +0000
Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=203.17.0=20=E2=86=92=203.17?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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<major>\d+)\.(?P<minor>\d+)\.(?P<release>[a-z]+)?(?P<patch>\d+)?
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 <major/minor/patch/release>'
-__version_tag__ = "3.17.0"
+__version_tag__ = "3.17.1"
 
 setup_kwargs = {
     "name": "dxtbx",

From 325f0bd8cf7aaa59e135f588916612070c7cd962 Mon Sep 17 00:00:00 2001
From: DiamondLightSource-build-server
 <DiamondLightSource-build-server@users.noreply.github.com>
Date: Mon, 12 Feb 2024 04:57:04 +0000
Subject: [PATCH 4/4] Towncrier for 3.17.1

    towncrier --name "DIALS" --version 3.17.1
---
 CHANGELOG.rst            | 15 +++++++++++++++
 newsfragments/665.bugfix |  1 -
 newsfragments/672.misc   |  1 -
 3 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 newsfragments/665.bugfix
 delete mode 100644 newsfragments/672.misc

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 <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/newsfragments/665.bugfix b/newsfragments/665.bugfix
deleted file mode 100644
index a0a44e441..000000000
--- a/newsfragments/665.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Importing the (deprecated and removed) ``dxtbx.datablock`` module failed to display warning properly.
diff --git a/newsfragments/672.misc b/newsfragments/672.misc
deleted file mode 100644
index f80db30d7..000000000
--- a/newsfragments/672.misc
+++ /dev/null
@@ -1 +0,0 @@
-Temporarily disable verbose masking geometry warning.