Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RF: drop Python 3.6 (EOLed), fix dcm2niix version in neurodocker script #555

Merged
merged 2 commits into from
Apr 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
language: python
dist: bionic
python:
- 3.6
- 3.7
- 3.8
- 3.9
# causes issues, disabled for now
# - '3.10'

cache:
- apt
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by Neurodocker version 0.4.2-3-gf7055a1
# Timestamp: 2018-11-13 22:04:04 UTC
# Timestamp: 2022-04-04 17:55:39 UTC
#
# Thank you for using Neurodocker. If you discover any issues
# or ways to improve this software, please submit an issue or
Expand Down Expand Up @@ -90,12 +90,12 @@ RUN export PATH="/opt/miniconda-latest/bin:$PATH" \
&& conda config --system --set show_channel_urls true \
&& sync && conda clean -tipsy && sync \
&& conda install -y -q --name base \
'python=3.6' \
'python=3.7' \
'traits>=4.6.0' \
'scipy' \
'numpy' \
'pandas' \
'nomkl' \
'pandas' \
&& sync && conda clean -tipsy && sync \
&& bash -c "source activate base \
&& pip install --no-cache-dir --editable \
Expand Down Expand Up @@ -143,12 +143,12 @@ RUN echo '{ \
\n { \
\n "use_env": "base", \
\n "conda_install": [ \
\n "python=3.6", \
\n "python=3.7", \
\n "traits>=4.6.0", \
\n "scipy", \
\n "numpy", \
\n "pandas", \
\n "nomkl" \
\n "nomkl", \
\n "pandas" \
\n ], \
\n "pip_install": [ \
\n "/src/heudiconv[all]" \
Expand Down
5 changes: 3 additions & 2 deletions heudiconv/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
'Environment :: Console',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
# needs fixing
# 'Programming Language :: Python :: 3.10',
'Topic :: Scientific/Engineering'
]

PYTHON_REQUIRES = ">=3.6"
PYTHON_REQUIRES = ">=3.7"

REQUIRES = [
'nibabel',
Expand Down
4 changes: 2 additions & 2 deletions utils/gen-docker-image.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ VER=$(grep -Po '(?<=^__version__ = ).*' ../heudiconv/info.py | sed 's/"//g')
image="kaczmarj/neurodocker:master@sha256:936401fe8f677e0d294f688f352cbb643c9693f8de371475de1d593650e42a66"

docker run --rm $image generate docker -b neurodebian:stretch -p apt \
--dcm2niix version=v1.0.20180622 method=source \
--dcm2niix version=v1.0.20190410 method=source \
--install git gcc pigz liblzma-dev libc-dev git-annex-standalone netbase \
--copy . /src/heudiconv \
--miniconda use_env=base conda_install="python=3.6 traits>=4.6.0 scipy numpy nomkl pandas" \
--miniconda use_env=base conda_install="python=3.7 traits>=4.6.0 scipy numpy nomkl pandas" \
pip_install="/src/heudiconv[all]" \
pip_opts="--editable" \
--entrypoint "heudiconv" \
Expand Down