Skip to content

Commit

Permalink
Merge pull request #4822 from voxel51/hotfix/pymongo
Browse files Browse the repository at this point in the history
Hotfix pymongo
  • Loading branch information
benjaminpkane authored Sep 19, 2024
2 parents ec273c8 + d5e20d0 commit 606694a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
9 changes: 9 additions & 0 deletions docs/source/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ FiftyOne Release Notes

.. default-role:: code


FiftyOne 0.25.2
---------------
*Released September 19, 2024*

* Require `pymongo<4.9` to fix database connections
* Require `pydicom<3` for :ref:`DICOM datasets <DICOMDataset-import>`


FiftyOne Teams 2.0.1
--------------------
*Released September 6, 2024*
Expand Down
4 changes: 2 additions & 2 deletions docs/source/user_guide/dataset_creation/datasets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4507,8 +4507,8 @@ of images and their associated properties stored in

.. note::

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

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

Expand Down
3 changes: 2 additions & 1 deletion fiftyone/utils/dicom.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
| `voxel51.com <https://voxel51.com/>`_
|
"""

import logging
import os
import warnings
Expand All @@ -16,7 +17,7 @@
import fiftyone.core.utils as fou
import fiftyone.utils.data as foud

fou.ensure_package("pydicom")
fou.ensure_package("pydicom<3")
import pydicom
from pydicom.fileset import FileInstance, FileSet

Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
open3d>=0.16.0
itsdangerous==2.0.1
werkzeug==3.0.3
pydicom
pydicom<3
pytest==7.3.1
pytest-cov==4.0.0
pytest-mock==3.10.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from setuptools import setup, find_packages


VERSION = "0.25.1"
VERSION = "0.25.2"


def get_version():
Expand Down Expand Up @@ -55,7 +55,7 @@ def get_version():
"plotly>=4.14",
"pprintpp",
"psutil",
"pymongo>=3.12",
"pymongo>=3.12,<4.9",
"pytz",
"PyYAML",
"regex",
Expand Down

0 comments on commit 606694a

Please sign in to comment.