diff --git a/.circleci/config.yml b/.circleci/config.yml index 000ecd5a19..3e95dceea7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -199,14 +199,6 @@ jobs: - workdir-v2-{{ .Branch }}- - workdir-v2-master- - workdir-v2- - - restore_cache: - keys: - - build-v1-{{ .Branch }}-{{ epoch }} - - build-v1-{{ .Branch }}- - - build-v1-master- - - build-v1- - paths: - - /tmp/docker - run: name: Refreshing cached intermediate results command: | @@ -233,6 +225,14 @@ jobs: echo "Found tag [wipe ${wipe_dir}] - clearing up $path ..." rm -rf ${path} fi + - restore_cache: + keys: + - build-v1-{{ .Branch }}-{{ epoch }} + - build-v1-{{ .Branch }}- + - build-v1-master- + - build-v1- + paths: + - /tmp/docker - run: name: Set-up a Docker registry command: | diff --git a/docs/requirements.txt b/docs/requirements.txt index 309f50d57e..0f9ac31c89 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,8 +2,8 @@ git+https://github.com/AleksandarPetrov/napoleon.git@0dc3f28a309ad602be5f44a9049 git+https://github.com/rwblair/sphinxcontrib-versioning.git@39b40b0b84bf872fc398feff05344051bbce0f63#egg=sphinxcontrib-versioning nbsphinx niflow-nipype1-workflows ~= 0.0.1 -nipype>=1.3.0rc1 -niworkflows ~= 1.0.0rc1 +nipype>=1.3.1 +niworkflows ~= 1.1.2 packaging pydot>=1.2.3 pydotplus diff --git a/setup.cfg b/setup.cfg index 8849aaaf7c..ea6e06c8be 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,13 +23,13 @@ python_requires = >=3.5 setup_requires = setuptools >=40.8 install_requires = - nibabel >=2.3 + nibabel >=3.0.0rc1 niflow-nipype1-workflows ~= 0.0.1 - nipype >= 1.3.1 - niworkflows ~= 1.1.1 + nipype >=1.3.1 + niworkflows ~= 1.1.2 numpy - pybids ~=0.9.2 - templateflow ~= 0.4 + pybids ~= 0.9.2 + templateflow >=0.4 test_requires = codecov coverage