From 17db82490f2930ec805da36d39ae7be09befb316 Mon Sep 17 00:00:00 2001 From: Dylan Nielson Date: Mon, 9 Nov 2020 16:55:49 -0500 Subject: [PATCH] FIX: Do not error when popping missing scan_length (#679) * FIX scanlength pop issue * pin sqlalchemhy version * Update setup.cfg Co-authored-by: Chris Markiewicz --- bids/analysis/analysis.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bids/analysis/analysis.py b/bids/analysis/analysis.py index 7929781ce..13fa53909 100644 --- a/bids/analysis/analysis.py +++ b/bids/analysis/analysis.py @@ -100,7 +100,7 @@ def setup(self, steps=None, drop_na=False, finalize=True, **kwargs): step.add_collections(drop_na=drop_na, **selectors) if finalize: - selectors.pop('scan_length') # see TODO below + selectors.pop('scan_length', None) # see TODO below self.finalize(**selectors) def finalize(self, **kwargs): diff --git a/setup.cfg b/setup.cfg index 674254d7b..450026d80 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ install_requires = nibabel >=2.1 pandas >=0.23 patsy - sqlalchemy + sqlalchemy <1.4.0.dev0 bids-validator num2words click