From c26cccea583bc5e8ff50581f210681a05f1d0edd Mon Sep 17 00:00:00 2001 From: Johan Carlin Date: Thu, 1 Nov 2018 18:44:13 +0000 Subject: [PATCH] Incremental install / configuration tweaks (#296) * Consistently allow newer Tornado setup.py and requirements.txt used to set conflicting requirements, which can be intentional but probably not in this case. * handle existing but empty .config/pycortex dir --- cortex/options.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cortex/options.py b/cortex/options.py index 9edc22bea..f72b39da0 100644 --- a/cortex/options.py +++ b/cortex/options.py @@ -18,7 +18,7 @@ # If user config doesn't exist, create it if len(files_successfully_read) == 0: - os.makedirs(userdir) + os.makedirs(userdir, exist_ok=True) with open(usercfg, 'w') as fp: config.write(fp) diff --git a/setup.py b/setup.py index a788db026..29bd22b03 100644 --- a/setup.py +++ b/setup.py @@ -88,7 +88,7 @@ def run(self): ] }, install_requires=[ - 'future', 'numpy', 'scipy', 'tornado==4.3', + 'future', 'numpy', 'scipy', 'tornado>=4.3', 'shapely', 'lxml', 'html5lib', 'h5py', 'numexpr', 'cython', 'matplotlib', 'pillow', 'nibabel', 'networkx==2.1', ],