Skip to content

Commit

Permalink
RF - make nisexts a native nibabel package rather than a subtree
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-brett committed Jan 19, 2011
1 parent 7083548 commit 5ff05b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 29 deletions.
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,5 @@ installed-tests:
sdist-tests:
$(PYTHON) -c 'from nisext.testers import sdist_tests; sdist_tests("nibabel")'

# Update nisext subtree from remote
update-nisext:
git fetch nisext
git merge --squash -s subtree --no-commit nisext/master

.PHONY: orig-src pylint

27 changes: 3 additions & 24 deletions nisext/__init__.py
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.
"""

0 comments on commit 5ff05b0

Please sign in to comment.