Skip to content

Commit 4b1831f

Browse files
committed
Merge branch 'structure'
2 parents 9f977b8 + 88d500e commit 4b1831f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+33
-30
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "async"]
2-
path = ext/async
3-
url = git://github.com/Byron/async.git
2+
path = gitdb/ext/async
3+
url = git://github.com/gitpython-developers/async.git

MANIFEST.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ include CHANGES
44
include AUTHORS
55
include README
66

7-
include _fun.c
8-
include _delta_apply.c
9-
include _delta_apply.h
7+
include gitdb/_fun.c
8+
include gitdb/_delta_apply.c
9+
include gitdb/_delta_apply.h
1010

11-
graft test
11+
prune gitdb/test
1212

1313
global-exclude .git*
1414
global-exclude *.pyc

README renamed to README.rst

Lines changed: 2 additions & 3 deletions

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# If extensions (or modules to document with autodoc) are in another directory,
1717
# add these directories to sys.path here. If the directory is relative to the
1818
# documentation root, use os.path.abspath to make it absolute, like shown here.
19-
sys.path.append(os.path.abspath('../../../'))
19+
sys.path.append(os.path.abspath('../../'))
2020

2121
# -- General configuration -----------------------------------------------------
2222

doc/source/intro.rst

Lines changed: 2 additions & 3 deletions

doc/source/tutorial.rst

Lines changed: 1 addition & 1 deletion

ext/async

Lines changed: 0 additions & 1 deletion
This file was deleted.

__init__.py renamed to gitdb/__init__.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
#{ Initialization
77
def _init_externals():
88
"""Initialize external projects by putting them into the path"""
9-
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext'))
9+
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'async'))
10+
11+
try:
12+
import async
13+
except ImportError:
14+
raise ImportError("'async' could not be imported, assure it is located in your PYTHONPATH")
15+
#END verify import
1016

1117
#} END initialization
1218

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)