Merge branch 'main' into additional_isissxd_methods

cctbx · Aug 16, 2024 · 8fe2a67 · 8fe2a67
2 parents 7f9c09f + 9a8cff3
commit 8fe2a67
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.azure-pipelines/ci-conda-env.txt b/.azure-pipelines/ci-conda-env.txt
@@ -1,10 +1,10 @@
 conda-forge::boost
 conda-forge::boost-cpp
 conda-forge::bzip2
-conda-forge::c-compiler<1.5
+conda-forge::c-compiler
 conda-forge::cctbx-base
 conda-forge::conda
-conda-forge::cxx-compiler<1.5
+conda-forge::cxx-compiler
 conda-forge::python-dateutil
 conda-forge::dials-data
 conda-forge::docutils
@@ -16,7 +16,7 @@ conda-forge::hdf5
 conda-forge::matplotlib-base
 conda-forge::mrcfile
 conda-forge::natsort
-conda-forge::numpy
+conda-forge::numpy<2
 conda-forge::nxmx
 conda-forge::orderedset
 conda-forge::pillow>=5.4.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20...3.30 FATAL_ERROR)
 
 project(dxtbx LANGUAGES C CXX)
 

diff --git a/newsfragments/743.misc b/newsfragments/743.misc
@@ -0,0 +1 @@
+Additional methods for FormatISISSXD to extract data more efficiently.
diff --git a/newsfragments/749.misc b/newsfragments/749.misc
@@ -0,0 +1 @@
+Set a CMake policy version, to avoid warnings on newer version.
diff --git a/newsfragments/750.misc b/newsfragments/750.misc
@@ -0,0 +1 @@
+Fix CI by pinning numpy 2.0.