Merge branch 'main' into cosym_filter_out_incompatible_cells

jbeilstenedmands · Jan 11, 2024 · df585a8 · df585a8
2 parents b266389 + 07bee6b
commit df585a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.conda-envs/linux.txt b/.conda-envs/linux.txt
@@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72
 conda-forge::docutils
 conda-forge::eigen
 conda-forge::future
-conda-forge::gemmi>=0.6.3
+conda-forge::gemmi=0.6.3
 conda-forge::h5py>=3.1.0
 conda-forge::hdf5<1.13
 conda-forge::hdf5plugin

diff --git a/.conda-envs/macos.txt b/.conda-envs/macos.txt
@@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72
 conda-forge::docutils
 conda-forge::eigen
 conda-forge::future
-conda-forge::gemmi>=0.6.3
+conda-forge::gemmi=0.6.3
 conda-forge::h5py>=3.1.0
 conda-forge::hdf5<1.13
 conda-forge::hdf5plugin

diff --git a/.conda-envs/windows.txt b/.conda-envs/windows.txt
@@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72
 conda-forge::docutils
 conda-forge::eigen
 conda-forge::future
-conda-forge::gemmi>=0.6.3
+conda-forge::gemmi=0.6.3
 conda-forge::h5py>=3.1.0
 conda-forge::hdf5<1.13
 conda-forge::hdf5plugin

diff --git a/newsfragments/2578.misc b/newsfragments/2578.misc
@@ -0,0 +1 @@
+Pin Gemmi dependency to 0.6.3 due to windows issues.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Pin Gemmi dependency to 0.6.3 due to windows issues.