8000 setup and doc generation works once again · gitpython-developers/gitdb@88d500e · GitHub
[go: up one dir, main page]
Skip to content

Commit 88d500e

Browse files
ByronByron
committed
setup and doc generation works once again
1 parent 0300d0d commit 88d500e

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

‎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

‎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

‎gitdb/fun.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444

4545
__all__ = ('is_loose_object', 'loose_object_header_info', 'msb_size', 'pack_object_header_info',
4646
'write_object', 'loose_object_header', 'stream_copy', 'apply_delta_data',
47-
'is_equal_canonical_sha', 'reverse_connect_deltas',
48-
'connect_deltas', 'DeltaChunkList')
47+
'is_equal_canonical_sha', 'connect_deltas', 'DeltaChunkList')
4948

5049

5150
#{ Structures
@@ -492,8 +491,10 @@ def stream_copy(read, write, size, chunk_size):
492491
return dbw
493492

494493
def connect_deltas(dstreams):
495-
"""Read the condensed delta chunk information from dstream and merge its information
496-
into a list of existing delta chunks
494+
"""
495+
Read the condensed delta chunk information from dstream and merge its information
496+
into a list of existing delta chunks
497+
497498
:param dstreams: iterable of delta stream objects, the delta to be applied last
498499
comes first, then all its ancestors in order
499500
:return: DeltaChunkList, containing all operations to apply"""

‎gitdb/pack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ def is_valid_stream(self, sha, use_crc=False):
651651
652652
:param use_crc: if True, the index' crc for the sha is used to determine
653653
:param sha: 20 byte sha1 of the object whose stream to verify
654-
whether the compressed stream of the object is valid. If it is
654+
whether the compressed stream of the object is valid. If it is
655655
a delta, this only verifies that the delta's data is valid, not the
656656
data of the actual undeltified object, as it depends on more than
657657
just this stream.

‎setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,9 @@ def get_data_files(self):
7575
author_email = "byronimo@gmail.com",
7676
url = "http://gitorious.org/git-python/gitdb",
7777
packages = ('gitdb', 'gitdb.db', 'gitdb.test', 'gitdb.test.db', 'gitdb.test.performance'),
78-
package_data={'gitdb' : ['AUTHORS', 'README'],
79-
'gitdb.test' : ['fixtures/packs/*', 'fixtures/objects/7b/*']},
80-
package_dir = {'gitdb':''},
81-
ext_modules=[Extension('gitdb._perf', ['_fun.c', '_delta_apply.c'], include_dirs=['.'])],
78+
package_data={ 'gitdb.test' : ['fixtures/packs/*', 'fixtures/objects/7b/*']},
79+
package_dir = {'gitdb':'gitdb'},
80+
ext_modules=[Extension('gitdb._perf', ['gitdb/_fun.c', 'gitdb/_delta_apply.c'], include_dirs=['gitdb'])],
8281
license = "BSD License",
8382
zip_safe=False,
8483
requires=('async (>=0.6.1)',),

0 commit comments

Comments
 (0)
0