Skip to content

Commit eb9b449

Browse files
committed
Fixes for Docker build. Added explicit installs for major python3 package dependencies
1 parent 765049b commit eb9b449

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# BIDSKIT v1.2.0
1+
# BIDSKIT 2019.12.20
22
# MAINTAINER: jmt@caltech.edu
33

44
# Install Ubuntu 18.04 LTS Bionic Beaver
55
FROM ubuntu:bionic
66

7-
# Install Node.js version 8
8-
FROM node:8
7+
# Install Node.js version 12
8+
FROM node:12
99

1010
# Install updates, Python3 for BIDS conversion script, Pip3 for Python to pull the pydicom module
1111
# git and make for building DICOM convertor from source + related dependencies
@@ -32,7 +32,13 @@ RUN cd /tmp && \
3232
cmake .. && \
3333
make install
3434

35+
# Install important python3 packages explicitly to avoid compilation errors from setup.py
36+
RUN pip3 install cython scipy numpy pandas
37+
38+
# Install python DICOM and BIDS packages
39+
RUN pip3 install pydicom pybids
40+
3541
# Install python3 bidskit in the container
3642
ADD . /myapp
3743
WORKDIR /myapp
38-
RUN python3 setup.py install
44+
RUN python3 setup.py install

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# BIDSKIT
2-
### Version 2019.8.16
2+
### Version 2019.12.20
33
Python utilities for converting from DICOM to BIDS neuroimaging formats.
44

55
The *bidskit* console command takes a directory tree containing imaging series from one or more subjects (eg T1w MPRAGE, BOLD EPI, Fieldmaps), converts the imaging data to Nifti-1 format with JSON metadata files (sidecars) and populates a directory tree according to the latest BIDS specification.

setup.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# For a discussion on single-sourcing the version across setup.py and the
4646
# project code, see
4747
# https://packaging.python.org/en/latest/single_source_version.html
48-
version='2019.8.16', # Required
48+
version='2019.12.20', # Required
4949

5050
# This is a one-line description or tagline of what your project does. This
5151
# corresponds to the "Summary" metadata field:
@@ -145,7 +145,7 @@
145145
# https://packaging.python.org/en/latest/requirements.html
146146
install_requires=['pydicom>=1.2.2',
147147
'pybids>=0.9.5',
148-
'numpy>=1.15.2'], # Optional
148+
'numpy'],
149149

150150
# List additional groups of dependencies here (e.g. development
151151
# dependencies). Users will be able to install these using the "extras"
@@ -203,4 +203,8 @@
203203
'Funding': 'http://conte.caltech.edu/',
204204
'Source': 'https://github.com/jmtyszka/bidskit/',
205205
},
206-
)
206+
207+
# Allow or forbid running this package directly from a zip file
208+
# https://setuptools.readthedocs.io/en/latest/setuptools.html#setting-the-zip-safe-flag
209+
zip_safe=False,
210+
)

0 commit comments

Comments
 (0)