Skip to content

Commit 606694a

Browse files
Merge pull request #4822 from voxel51/hotfix/pymongo
Hotfix pymongo
2 parents ec273c8 + d5e20d0 commit 606694a

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

docs/source/release-notes.rst

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ FiftyOne Release Notes
33

44
.. default-role:: code
55

6+
7+
FiftyOne 0.25.2
8+
---------------
9+
*Released September 19, 2024*
10+
11+
* Require `pymongo<4.9` to fix database connections
12+
* Require `pydicom<3` for :ref:`DICOM datasets <DICOMDataset-import>`
13+
14+
615
FiftyOne Teams 2.0.1
716
--------------------
817
*Released September 6, 2024*

docs/source/user_guide/dataset_creation/datasets.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -4507,8 +4507,8 @@ of images and their associated properties stored in
45074507

45084508
.. note::
45094509

4510-
You must have `pydicom <https://github.com/pydicom/pydicom>`_ installed in
4511-
order to load DICOM datasets.
4510+
You must have `pydicom<3 <https://github.com/pydicom/pydicom>`_ installed
4511+
in order to load DICOM datasets.
45124512

45134513
The standard format for datasets of this type is the following:
45144514

fiftyone/utils/dicom.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
| `voxel51.com <https://voxel51.com/>`_
66
|
77
"""
8+
89
import logging
910
import os
1011
import warnings
@@ -16,7 +17,7 @@
1617
import fiftyone.core.utils as fou
1718
import fiftyone.utils.data as foud
1819

19-
fou.ensure_package("pydicom")
20+
fou.ensure_package("pydicom<3")
2021
import pydicom
2122
from pydicom.fileset import FileInstance, FileSet
2223

requirements/test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
open3d>=0.16.0
22
itsdangerous==2.0.1
33
werkzeug==3.0.3
4-
pydicom
4+
pydicom<3
55
pytest==7.3.1
66
pytest-cov==4.0.0
77
pytest-mock==3.10.0

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from setuptools import setup, find_packages
1414

1515

16-
VERSION = "0.25.1"
16+
VERSION = "0.25.2"
1717

1818

1919
def get_version():
@@ -55,7 +55,7 @@ def get_version():
5555
"plotly>=4.14",
5656
"pprintpp",
5757
"psutil",
58-
"pymongo>=3.12",
58+
"pymongo>=3.12,<4.9",
5959
"pytz",
6060
"PyYAML",
6161
"regex",

0 commit comments

Comments
 (0)