Skip to content
Browse files

RF - make nisexts a native nibabel package rather than a subtree

  • Loading branch information...
1 parent 7083548 commit 5ff05b026e498e599e7f98f5ae9a10230579bb3d @matthew-brett matthew-brett committed Jan 19, 2011
Showing with 3 additions and 29 deletions.
  1. +0 −5 Makefile
  2. +3 −24 nisext/
5 Makefile
@@ -243,10 +243,5 @@ installed-tests:
$(PYTHON) -c 'from nisext.testers import sdist_tests; sdist_tests("nibabel")'
-# Update nisext subtree from remote
- git fetch nisext
- git merge --squash -s subtree --no-commit nisext/master
.PHONY: orig-src pylint
27 nisext/
@@ -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://
- 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.

0 comments on commit 5ff05b0

Please sign in to comment.
Something went wrong with that request. Please try again.