Skip to content

FIX: Package version incorrect within Docker image#155

Merged
effigies merged 1 commit intonipreps:masterfrom
oesteban:fix/docker-python-package-version
Jan 17, 2020
Merged

FIX: Package version incorrect within Docker image#155
effigies merged 1 commit intonipreps:masterfrom
oesteban:fix/docker-python-package-version

Conversation

@oesteban
Copy link
Member

Addresses the problem that sMRIPrep inside containers gives version 0+xxx

  • Updated versioneer with fmriprep's one to consider the VERSION file hack.
  • Follow fmriprep in dropping include_package_data = True from the setup.cfg file.

@oesteban oesteban requested a review from effigies January 17, 2020 21:57
@effigies
Copy link
Member

From: https://1093-164755300-gh.circle-artifacts.com/0/tmp/ds005/derivatives/smriprep/sub-01.html

About

  • sMRIPrep version: v0.3.2+90.g35b244a

Git hash is right, but are we not using annotated tags, or what's the reason we're not seeing 0.4.1+?

@oesteban
Copy link
Member Author

Okay, that is probably because my tags are out of sync and these tests are run on against my fork.

However, I'm pretty positive that this patch should go in, please look at a docker build from master: https://app.circleci.com/jobs/github/poldracklab/smriprep/2274/parallel-runs/0/steps/0-105 and this is what the report shows https://2280-160736148-gh.circle-artifacts.com/0/tmp/ds005/derivatives/smriprep/sub-01.html#About (0+)

@oesteban
Copy link
Member Author

$ git push --tags
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 325 bytes | 325.00 KiB/s, done.
Total 1 (delta 0), reused 1 (delta 0)
To github.com:oesteban/smriprep.git
 * [new tag]           0.2.0a1 -> 0.2.0a1
 * [new tag]           0.4.0 -> 0.4.0
 * [new tag]           0.4.0rc1 -> 0.4.0rc1
 * [new tag]           0.4.0rc2 -> 0.4.0rc2
 * [new tag]           0.4.0rc3 -> 0.4.0rc3
 * [new tag]           0.4.0rc4 -> 0.4.0rc4
 * [new tag]           0.4.0rc5 -> 0.4.0rc5
 * [new tag]           0.4.1 -> 0.4.1
 * [new tag]           0.4.1-1 -> 0.4.1-1

I was outdated.

@effigies effigies merged commit df642c0 into nipreps:master Jan 17, 2020
@oesteban oesteban deleted the fix/docker-python-package-version branch January 17, 2020 23:23
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.

2 participants

Comments