Skip to content

Commit 08ad903

Browse files
authored
Merge pull request #183 from satra/enh/et
enh: add etelemetry
2 parents 39d2b2d + eb6486e commit 08ad903

File tree

7 files changed

+27
-7
lines changed

7 files changed

+27
-7
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
conda create -n $ENV_NAME python=3.6 pip
2828
source activate $ENV_NAME
2929
conda install -y cmake mesalib vtk pandas matplotlib \
30-
colormath nipype tbb-devel nose
30+
colormath nipype tbb-devel nose etelemetry
3131
conda info --envs
3232
python setup.py install
3333
mkdir $vtk_cpp_tools && cd $vtk_cpp_tools && cmake ../ && make

info.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@
5151
PLATFORMS = "Linux"
5252
VERSION = __version__
5353
PROVIDES = ["mindboggle"]
54-
REQUIRES = ["nipype", "matplotlib", "colormath", "pandas"]
54+
REQUIRES = ["nipype", "matplotlib", "colormath", "pandas",
55+
"etelemetry"]
5556

install/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by Neurodocker version 0.4.2-3-gf7055a1
2-
# Timestamp: 2019-06-11 01:55:15 UTC
2+
# Timestamp: 2019-09-22 16:31:40 UTC
33
#
44
# Thank you for using Neurodocker. If you discover any issues
55
# or ways to improve this software, please submit an issue or
@@ -90,6 +90,7 @@ RUN export PATH="/opt/miniconda-latest/bin:$PATH" \
9090
'nilearn' \
9191
'tbb-devel' \
9292
'nose' \
93+
'etelemetry' \
9394
&& sync && conda clean -tipsy && sync \
9495
&& bash -c "source activate mb \
9596
&& pip install --no-cache-dir \
@@ -238,7 +239,8 @@ RUN echo '{ \
238239
\n "nipype>=1.1.4", \
239240
\n "nilearn", \
240241
\n "tbb-devel", \
241-
\n "nose" \
242+
\n "nose", \
243+
\n "etelemetry" \
242244
\n ], \
243245
\n "pip_install": [ \
244246
\n "datalad[full]", \

install/neurodocker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ docker run --rm ${image} generate docker \
5959
--run 'ln -s /usr/lib/x86_64-linux-gnu /usr/lib64' \
6060
--miniconda \
6161
conda_install="python=3.6 pip jupyter cmake mesalib vtk=8.2 pandas
62-
matplotlib colormath nipype>=1.1.4 nilearn tbb-devel nose" \
62+
matplotlib colormath nipype>=1.1.4 nilearn tbb-devel nose etelemetry" \
6363
pip_install="datalad[full] duecredit" \
6464
create_env="mb" \
6565
activate=true \

mindboggle/__init__.py

+15
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,18 @@
1717
#from . import blah as blah
1818
# object imports
1919
#from .blah import blah, blah
20+
21+
import etelemetry
22+
23+
INIT_MSG = "Running {packname} version {version} (latest: {latest})".format
24+
latest = {"version": 'Unknown'}
25+
try:
26+
from .version import __version__
27+
latest = etelemetry.get_project("nipy/mindboggle")
28+
except Exception as e:
29+
print("Could not check for version updates: ", e)
30+
finally:
31+
print(INIT_MSG(packname='mindboggle',
32+
version=__version__,
33+
latest=latest["version"]))
34+

mindboggle/mindboggle

+2-1
Original file line numberDiff line numberDiff line change
@@ -2375,7 +2375,8 @@ if __name__ == '__main__':
23752375
# ------------------------------------------------------------------------
23762376
mbFlow.config['execution']['hash_method'] = 'content'
23772377
mbFlow.config['execution']['crashfile_format'] = 'txt'
2378-
# mbFlow.config['execution']['use_relative_paths'] = True
2378+
# Do not propagate the check to sub nodes
2379+
mbFlow.config['execution']['check_version'] = False
23792380

23802381
# ------------------------------------------------------------------------
23812382
# Generate a visual graph:

mindboggle/mindboggle123

+2-1
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,10 @@ if __name__ == '__main__':
452452
# Workflow configuration: content hashing, crashfiles, etc.:
453453
# --------------------------------------------------------------------
454454
mbFlow.config['execution']['hash_method'] = 'content'
455-
# mbFlow.config['execution']['use_relative_paths'] = True
456455
mbFlow.config['execution']['crashfile_format'] = 'txt'
457456
mbFlow.config['execution']['crashdump_dir'] = WORK
457+
# Do not propagate the version check to sub nodes
458+
mbFlow.config['execution']['check_version'] = False
458459

459460
# --------------------------------------------------------------------
460461
# Debug: http://nipy.org/nipype/users/config_file.html#debug-configuration

0 commit comments

Comments
 (0)