Skip to content

Commit 5ff05b0

Browse files
committed
RF - make nisexts a native nibabel package rather than a subtree
1 parent 7083548 commit 5ff05b0

File tree

2 files changed

+3
-29
lines changed

2 files changed

+3
-29
lines changed

Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,5 @@ installed-tests:
243243
sdist-tests:
244244
$(PYTHON) -c 'from nisext.testers import sdist_tests; sdist_tests("nibabel")'
245245

246-
# Update nisext subtree from remote
247-
update-nisext:
248-
git fetch nisext
249-
git merge --squash -s subtree --no-commit nisext/master
250-
251246
.PHONY: orig-src pylint
252247

nisext/__init__.py

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,7 @@
11
# init for sext package
2-
""" Setuptools extensions that can be shared across projects
2+
""" Setuptools extensions
33
4-
Typical use for these routines is as a git subtree merge
5-
6-
For example::
7-
8-
# Add a remote pointing to repository
9-
git remote add nisext git://github.com/nipy/nisext.git
10-
git fetch nisext
11-
# Label nisext history as merged
12-
git merge -s ours --no-commit nisext/master
13-
# Read nisext contents as nisext subdirectory
14-
git read-tree --prefix=nisext/ -u nisext/master
15-
git commit -m "Merge nisext project as subtree"
16-
17-
Then you would typically add a makefile target like::
18-
19-
# Update nisext subtree from remote
20-
update-nisext:
21-
git fetch nisext
22-
git merge --squash -s subtree --no-commit nisext/master
23-
24-
and commit when you have changes you want. This allows you to keep the nisext
25-
tree updated from the upstream repository, but the tree will be there and ready
26-
for someone without this machinery or remote.
4+
nibabel uses these routines, and houses them, and installs them. nipy-proper
5+
and dipy use them.
276
"""
287

0 commit comments

Comments
 (0)