Skip to content

Commit

Permalink
fix: define max version for pydicom to avoid breaking changes (#267)
Browse files Browse the repository at this point in the history
* fix: define max version for pydicom to avoid breaking changes
* chore: bump version and update changelog
  • Loading branch information
sammaxwellxyz authored Oct 2, 2024
1 parent ebae1c6 commit 830966d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 30 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
Referenced versions in headers are tagged on Github, in parentheses are for pypi.

## [vxx](https://github.com/pydicom/deid/tree/master) (master)
- Refactor INCLUDE_REQUIRES and provide max pydicom version [#267](https://github.com/pydicom/deid/pull/267) (0.3.25)
- Support pydicom.Dataset objects created from BytesIO [#265](https://github.com/pydicom/deid/pull/265) (0.3.24)
- Exception with missing filters for non-string VR [#256](https://github.com/pydicom/deid/issues/256) (0.3.23)
- Allow filter tag names to be 0x-prefix hex numbers so private tags can be referenced in recipes [#253](https://github.com/pydicom/deid/issues/253) (0.3.22)
Expand Down
10 changes: 5 additions & 5 deletions deid/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
__copyright__ = "Copyright 2016-2023, Vanessa Sochat"
__license__ = "MIT"

__version__ = "0.3.24"
__version__ = "0.3.25"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "[email protected]"
NAME = "deid"
Expand All @@ -12,8 +12,8 @@
LICENSE = "LICENSE"

INSTALL_REQUIRES = (
("matplotlib", {"min_version": None}),
("numpy", {"min_version": "1.20"}),
("pydicom", {"min_version": "2.2.2"}),
("python-dateutil", {"min_version": None}),
"matplotlib",
"numpy>=1.20",
"pydicom>=2.2.2,<3.0.0",
"python-dateutil",
)
26 changes: 1 addition & 25 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,7 @@ def get_requirements(lookup=None):
if lookup is None:
lookup = get_lookup()

install_requires = []
for module in lookup["INSTALL_REQUIRES"]:
module_name = module[0]
module_meta = module[1]

# Install exact version
if "exact_version" in module_meta:
dependency = "%s==%s" % (module_name, module_meta["exact_version"])

# Install min version
elif "min_version" in module_meta:
if module_meta["min_version"] is None:
dependency = module_name
else:
dependency = "%s>=%s" % (module_name, module_meta["min_version"])

# Install min version
elif "max_version" in module_meta:
if module_meta["max_version"] is None:
dependency = module_name
else:
dependency = "%s<=%s" % (module_name, module_meta["max_version"])

install_requires.append(dependency)
return install_requires
return lookup["INSTALL_REQUIRES"]


# Make sure everything is relative to setup.py
Expand Down

0 comments on commit 830966d

Please sign in to comment.