forked from nipy/nibabel
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RF - make nisexts a native nibabel package rather than a subtree
- Loading branch information
1 parent
7083548
commit 5ff05b0
Showing
2 changed files
with
3 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,7 @@ | ||
# init for sext package | ||
""" Setuptools extensions that can be shared across projects | ||
""" Setuptools extensions | ||
Typical use for these routines is as a git subtree merge | ||
For example:: | ||
# Add a remote pointing to repository | ||
git remote add nisext git://github.com/nipy/nisext.git | ||
git fetch nisext | ||
# Label nisext history as merged | ||
git merge -s ours --no-commit nisext/master | ||
# Read nisext contents as nisext subdirectory | ||
git read-tree --prefix=nisext/ -u nisext/master | ||
git commit -m "Merge nisext project as subtree" | ||
Then you would typically add a makefile target like:: | ||
# Update nisext subtree from remote | ||
update-nisext: | ||
git fetch nisext | ||
git merge --squash -s subtree --no-commit nisext/master | ||
and commit when you have changes you want. This allows you to keep the nisext | ||
tree updated from the upstream repository, but the tree will be there and ready | ||
for someone without this machinery or remote. | ||
nibabel uses these routines, and houses them, and installs them. nipy-proper | ||
and dipy use them. | ||
""" | ||
|