1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From: Roland Mas <lolando@debian.org>
Date: Tue, 24 Sep 2024 12:30:44 +0200
Subject: Replace orderedset with ordered_set
---
setup.py | 2 +-
src/dials/command_line/integrate.py | 2 ++
src/dials/command_line/split_experiments.py | 2 ++
src/dials/util/multi_dataset_handling.py | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 7297b58..65bfd40 100644
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@
"cctbx",
"dxtbx",
"jinja2",
- "orderedset",
+ "ordered_set",
"pandas",
"psutil",
"pyFAI",
diff --git a/src/dials/command_line/integrate.py b/src/dials/command_line/integrate.py
index 0520c47..de881e4 100644
--- a/src/dials/command_line/integrate.py
+++ b/src/dials/command_line/integrate.py
@@ -26,6 +26,8 @@
import sys
import warnings
+from ordered_set import OrderedSet
+
from dxtbx.model.experiment_list import Experiment, ExperimentList
from libtbx.phil import parse
diff --git a/src/dials/command_line/split_experiments.py b/src/dials/command_line/split_experiments.py
index c08b1e0..fd90842 100644
--- a/src/dials/command_line/split_experiments.py
+++ b/src/dials/command_line/split_experiments.py
@@ -2,6 +2,8 @@
import functools
+from ordered_set import OrderedSet
+
from dxtbx.model.experiment_list import ExperimentList
from libtbx.phil import parse
diff --git a/src/dials/util/multi_dataset_handling.py b/src/dials/util/multi_dataset_handling.py
index 2fe843f..092c970 100644
--- a/src/dials/util/multi_dataset_handling.py
+++ b/src/dials/util/multi_dataset_handling.py
@@ -8,6 +8,8 @@
import copy
import logging
+from ordered_set import OrderedSet
+
import iotbx.phil
from dxtbx.util import ersatz_uuid4
|
