Skip to content

Commit

Permalink
Incremental install / configuration tweaks (gallantlab#296)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
jooh authored and marklescroart committed Nov 1, 2018
1 parent 0e4b8cd commit c26ccce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cortex/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
Expand Down

0 comments on commit c26ccce

Please sign in to comment.