From b2eba4ae76f19071196e3e19693499975b89be68 Mon Sep 17 00:00:00 2001 From: "arnaud.bore" Date: Wed, 7 Jun 2023 16:00:58 -0400 Subject: [PATCH] remove future --- dcm2bids/acquisition.py | 3 +-- dcm2bids/sidecar.py | 8 ++++---- setup.py | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dcm2bids/acquisition.py b/dcm2bids/acquisition.py index dc95f3b6..30d462cb 100644 --- a/dcm2bids/acquisition.py +++ b/dcm2bids/acquisition.py @@ -4,7 +4,6 @@ import logging from os.path import join as opj -from future.utils import iteritems from dcm2bids.utils.utils import DEFAULT from dcm2bids.utils.tools import __version__ @@ -227,7 +226,7 @@ def dstSidecarData(self, descriptions, intendedForList): data["IntendedFor"] = intendedValue # sidecarChanges - for key, value in iteritems(self.sidecarChanges): + for key, value in self.sidecarChanges.items(): data[key] = value return data diff --git a/dcm2bids/sidecar.py b/dcm2bids/sidecar.py index 823769a3..d2a58d6a 100644 --- a/dcm2bids/sidecar.py +++ b/dcm2bids/sidecar.py @@ -8,7 +8,7 @@ import re from collections import defaultdict, OrderedDict from fnmatch import fnmatch -from future.utils import iteritems + from dcm2bids.acquisition import Acquisition from dcm2bids.utils.utils import DEFAULT, splitext_ from dcm2bids.utils.io import load_json @@ -190,7 +190,7 @@ def compare(name, pattern): result = [] - for tag, pattern in iteritems(criteria): + for tag, pattern in criteria.items(): name = data.get(tag, '') if isinstance(name, list): @@ -218,7 +218,7 @@ def build_acquisitions(self, participant): acquisitions_intendedFor = [] self.logger.info("Sidecars pairing:") - for sidecar, valid_descriptions in iteritems(self.graph): + for sidecar, valid_descriptions in self.graph.items(): sidecarName = os.path.basename(sidecar.root) # only one description for the sidecar @@ -274,7 +274,7 @@ def duplicates(seq): for i, item in enumerate(seq): tally[item].append(i) - for key, locs in iteritems(tally): + for key, locs in tally.items(): if len(locs) > 1: yield key, locs diff --git a/setup.py b/setup.py index ffd24d12..5ceac7f3 100755 --- a/setup.py +++ b/setup.py @@ -25,8 +25,8 @@ license=LICENSE, classifiers=CLASSIFIERS, platforms=PLATFORMS, - python_requires=">=3.7", - install_requires=['future>=0.17.1', 'packaging>=23.1'], + python_requires=">3.7", + install_requires=['packaging>=23.1'], version=VERSION, packages=find_packages(exclude=["tests"]), entry_points=ENTRY_POINTS)