Skip to content

Commit 2f2fe4e

Browse files
committed
Merge branch 'py2n3'
* python 3 compatibility * all tests work in py2.6, 2.7, 3.3, 3.4
2 parents 81707c6 + 0dcec5a commit 2f2fe4e

Some content is hidden

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

47 files changed

+1767
-1826
lines changed

Diff for: .gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "async"]
2-
path = gitdb/ext/async
3-
url = https://github.com/gitpython-developers/async.git
41
[submodule "smmap"]
52
path = gitdb/ext/smmap
63
url = https://github.com/Byron/smmap.git

Diff for: .travis.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ python:
33
- "2.6"
44
- "2.7"
55
- "3.3"
6+
- "3.4"
67
# - "pypy" - won't work as smmap doesn't work (see smmap/.travis.yml for details)
78

8-
script: nosetests
9+
git:
10+
# a higher depth is needed for one of the tests - lets fet
11+
depth: 1000
12+
install:
13+
- pip install coveralls
14+
script:
15+
- nosetests -v
16+
after_success:
17+
- coveralls
18+

Diff for: README.rst

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
GitDB
22
=====
33

4-
GitDB allows you to access bare git repositories for reading and writing. It
5-
aims at allowing full access to loose objects as well as packs with performance
6-
and scalability in mind. It operates exclusively on streams, allowing to operate
7-
on large objects with a small memory footprint.
4+
GitDB allows you to access bare git repositories for reading and writing. It aims at allowing full access to loose objects as well as packs with performance and scalability in mind. It operates exclusively on streams, allowing to handle large objects with a small memory footprint.
85

96
Installation
107
============
@@ -23,13 +20,13 @@ From `PyPI <https://pypi.python.org/pypi/gitdb>`_
2320
REQUIREMENTS
2421
============
2522

26-
* Python Nose - for running the tests
23+
* Python Nose - for running the tests
2724

2825
SOURCE
2926
======
3027
The source is available in a git repository at gitorious and github:
3128

32-
git://github.com/gitpython-developers/gitdb.git
29+
https://github.com/gitpython-developers/gitdb
3330

3431
Once the clone is complete, please be sure to initialize the submodules using
3532

@@ -40,17 +37,25 @@ Run the tests with
4037

4138
nosetests
4239

43-
MAILING LIST
44-
============
45-
http://groups.google.com/group/git-python
46-
47-
ISSUE TRACKER
48-
=============
40+
DEVELOPMENT
41+
===========
4942

5043
.. image:: https://travis-ci.org/gitpython-developers/gitdb.svg?branch=master
5144
:target: https://travis-ci.org/gitpython-developers/gitdb
52-
53-
https://github.com/gitpython-developers/gitdb/issues
45+
46+
.. image:: https://coveralls.io/repos/gitpython-developers/gitdb/badge.png
47+
:target: https://coveralls.io/r/gitpython-developers/gitdb
48+
49+
The library is considered mature, and not under active development. It's primary (known) use is in git-python.
50+
51+
INFRASTRUCTURE
52+
==============
53+
54+
* Mailing List
55+
* http://groups.google.com/group/git-python
56+
57+
* Issue Tracker
58+
* https://github.com/gitpython-developers/gitdb/issues
5459

5560
LICENSE
5661
=======

Diff for: doc/source/changes.rst

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
Changelog
33
#########
44

5+
*****
6+
0.6.0
7+
*****
8+
9+
* Added support got python 3.X
10+
* Removed all `async` dependencies and all `*_async` versions of methods with it.
11+
512
*****
613
0.5.4
714
*****

Diff for: doc/source/intro.rst

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Interfaces are used to describe the API, making it easy to provide alternate imp
1111
================
1212
Installing GitDB
1313
================
14-
Its easiest to install gitdb using the *easy_install* program, which is part of the `setuptools`_::
14+
Its easiest to install gitdb using the *pip* program::
1515
16-
$ easy_install gitdb
16+
$ pip install gitdb
1717
1818
As the command will install gitdb in your respective python distribution, you will most likely need root permissions to authorize the required changes.
1919

@@ -31,10 +31,8 @@ Source Repository
3131
=================
3232
The latest source can be cloned using git from github:
3333

34-
* git://github.com/gitpython-developers/gitdb.git
34+
* https://github.com/gitpython-developers/gitdb
3535

3636
License Information
3737
===================
3838
*GitDB* is licensed under the New BSD License.
39-
40-
.. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools

Diff for: gitdb/__init__.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,28 @@
1010
#{ Initialization
1111
def _init_externals():
1212
"""Initialize external projects by putting them into the path"""
13-
for module in ('async', 'smmap'):
13+
for module in ('smmap',):
1414
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', module))
15-
15+
1616
try:
1717
__import__(module)
1818
except ImportError:
1919
raise ImportError("'%s' could not be imported, assure it is located in your PYTHONPATH" % module)
2020
#END verify import
2121
#END handel imports
22-
22+
2323
#} END initialization
2424

2525
_init_externals()
2626

2727
__author__ = "Sebastian Thiel"
2828
__contact__ = "[email protected]"
2929
__homepage__ = "https://github.com/gitpython-developers/gitdb"
30-
version_info = (0, 5, 4)
30+
version_info = (0, 6, 0)
3131
__version__ = '.'.join(str(i) for i in version_info)
3232

3333

3434
# default imports
35-
from db import *
36-
from base import *
37-
from stream import *
38-
35+
from gitdb.base import *
36+
from gitdb.db import *
37+
from gitdb.stream import *

Diff for: gitdb/_delta_apply.c

-2
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ DeltaInfo* DIV_closest_chunk(const DeltaInfoVector* vec, ull ofs)
506506
// Return the amount of chunks a slice at the given spot would have, as well as
507507
// its size in bytes it would have if the possibly partial chunks would be encoded
508508
// and added to the spot marked by sdc
509-
inline
510509
uint DIV_count_slice_bytes(const DeltaInfoVector* src, uint ofs, uint size)
511510
{
512511
uint num_bytes = 0;
@@ -559,7 +558,6 @@ uint DIV_count_slice_bytes(const DeltaInfoVector* src, uint ofs, uint size)
559558
// destination memory. The individual chunks written will be a byte copy of the source
560559
// data chunk stream
561560
// Return: number of chunks in the slice
562-
inline
563561
uint DIV_copy_slice_to(const DeltaInfoVector* src, uchar** dest, ull tofs, uint size)
564562
{
565563
assert(DIV_lbound(src) <= tofs);

0 commit comments

Comments
 (0)