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

MAINT: Finalize the work we started with the refactor of the Docker image #2601

Merged
merged 2 commits into from
Oct 15, 2021

Conversation

oesteban
Copy link
Member

Builds on top of #2581 with the following additions:

  • Multi-stage from nipreps/miniconda:py38_1.3.2 which has an almost complete environment set-up for fMRIPrep and dMRIPrep. Builds now should not need to download many packages.
  • Bring back the link dependencies to niworkflows and sdcflows, following prior conversations about how to handle these.
  • Clean up some packages listed as dependencies that we never used within fMRIPrep's codebase (these packages are installed by other dependencies).

Hopefully, a first step towards the smooth transition into these multi-staged builds.

@oesteban oesteban requested review from effigies and mgxd October 15, 2021 15:04
@@ -51,7 +48,6 @@ packages = find:
[options.extras_require]
datalad = datalad
doc =
nbsphinx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is breaking RTD.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left nbsphinx as an extension - but we don't have any notebooks to render. So I removed it there.

nitransforms ~= 21.0.0
niworkflows ~= 1.4.1
niworkflows @ git+https://github.com/nipreps/niworkflows.git@master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I may have missed/forgotten a conversation. Is the to only pin at release?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it helps us catch any potential problems sooner.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

K. I assume this will change to maint/1.4.x once that diverges from master?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We didn't get that far in the discussion, but yes, I guess that for maint/20.2.x and so on should pin the corresponding maintenance lines of niworkflows and sdcflows.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is why we relaxed the packaging tests to only exercise rel/* and tags, right?

@effigies effigies merged commit 33432c0 into master Oct 15, 2021
@effigies effigies deleted the docker/deps-cleanup branch October 15, 2021 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants