Skip to content

Commit b4c1e1e

Browse files
committed
Fix merge conflict
1 parent 223b9c5 commit b4c1e1e

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

.ci/docker/requirements-ci.txt

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,11 @@ numba==0.61.2 ; python_version > "3.9"
136136
#test_nn.py, test_namedtensor.py, test_linalg.py, test_jit_cuda_fuser.py,
137137
#test_jit.py, test_indexing.py, test_datapipe.py, test_dataloader.py,
138138
#test_binary_ufuncs.py
139-
<<<<<<< HEAD
140-
numpy==2.0.2 ; python_version == "3.9"
141-
numpy==2.1.2 ; python_version > "3.9"
142-
143-
pandas==2.2.3
144-
=======
145-
numpy==1.22.4; python_version == "3.10"
146-
numpy==1.26.2; python_version == "3.11" or python_version == "3.12"
147-
numpy==2.1.2; python_version >= "3.13" and python_version < "3.14"
139+
numpy==2.1.2; python_version > "3.9" and python_version < "3.14"
148140
numpy==2.3.4; python_version >= "3.14"
149141

150-
pandas==2.0.3; python_version < "3.13"
151-
pandas==2.2.3; python_version >= "3.13" and python_version < "3.14"
142+
pandas==2.2.3; python_version >= "3.9" and python_version < "3.14"
152143
pandas==2.3.3; python_version >= "3.14"
153-
>>>>>>> upstream/main
154144

155145
#onnxruntime
156146
#Description: scoring engine for Open Neural Network Exchange (ONNX) models
@@ -261,14 +251,8 @@ scikit-image==0.22.0
261251
#Pinned versions: 0.20.3
262252
#test that import:
263253

264-
<<<<<<< HEAD
265-
scipy==1.13.1 ; python_version == "3.9"
266-
scipy==1.14.1 ; python_version > "3.9"
267-
=======
268-
scipy==1.10.1 ; python_version <= "3.11"
269-
scipy==1.14.1 ; python_version > "3.11" and python_version < "3.14"
254+
scipy==1.14.1 ; python_version > "3.9" and python_version < "3.14"
270255
scipy==1.16.2 ; python_version >= "3.14"
271-
>>>>>>> upstream/main
272256
# Pin SciPy because of failing distribution tests (see #60347)
273257
#Description: scientific python
274258
#Pinned versions: 1.10.1

0 commit comments

Comments
 (0)