Skip to content

Commit d829152

Browse files
authored
Merge branch 'master' into PR-UnicodeEncodeError
2 parents 39d3666 + f356e12 commit d829152

19 files changed

+113
-312
lines changed

Diff for: .appveyor.yml

-49
This file was deleted.

Diff for: .travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
22
python:
3-
- "2.7"
43
- "3.4"
54
- "3.5"
65
- "3.6"

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ release:: clean
1717
force_release:: clean
1818
git push --tags
1919
python3 setup.py sdist bdist_wheel
20-
twine upload -s -i [email protected] dist/*
20+
twine upload -s -i 763629FEC8788FC35128B5F6EE029D1E5EB40300 dist/*
2121

2222
doc::
2323
make -C doc/ html

Diff for: README.rst

-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ DEVELOPMENT
5656
:target: https://ci.appveyor.com/project/ankostis/gitpython/branch/master)
5757
.. image:: https://coveralls.io/repos/gitpython-developers/gitdb/badge.png
5858
:target: https://coveralls.io/r/gitpython-developers/gitdb
59-
.. image:: http://www.issuestats.com/github/gitpython-developers/gitdb/badge/pr
60-
:target: http://www.issuestats.com/github/gitpython-developers/gitdb
61-
.. image:: http://www.issuestats.com/github/gitpython-developers/gitdb/badge/issue
62-
:target: http://www.issuestats.com/github/gitpython-developers/gitdb
6359

6460
The library is considered mature, and not under active development. It's primary (known) use is in git-python.
6561

Diff for: doc/source/changes.rst

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

5+
*****
6+
3.0.2
7+
*****
8+
9+
* removed all python2 compatibility shims, GitDB now is a Python 3 program.
10+
511
*****
612
0.6.1
713
*****

Diff for: gitdb/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def _init_externals():
2929
__author__ = "Sebastian Thiel"
3030
__contact__ = "[email protected]"
3131
__homepage__ = "https://github.com/gitpython-developers/gitdb"
32-
version_info = (2, 0, 5)
32+
version_info = (3, 0, 2)
3333
__version__ = '.'.join(str(i) for i in version_info)
3434

3535

Diff for: gitdb/db/loose.py

+6-10
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
stream_copy
5151
)
5252

53-
from gitdb.utils.compat import MAXSIZE
5453
from gitdb.utils.encoding import force_bytes
5554

5655
import tempfile
5756
import os
57+
import sys
5858

5959

6060
__all__ = ('LooseObjectDB', )
@@ -196,7 +196,7 @@ def store(self, istream):
196196
if istream.binsha is not None:
197197
# copy as much as possible, the actual uncompressed item size might
198198
# be smaller than the compressed version
199-
stream_copy(istream.read, writer.write, MAXSIZE, self.stream_chunk_size)
199+
stream_copy(istream.read, writer.write, sys.maxsize, self.stream_chunk_size)
200200
else:
201201
# write object with header, we have to make a new one
202202
write_object(istream.type, istream.size, istream.read, writer.write,
@@ -225,16 +225,12 @@ def store(self, istream):
225225
if not isdir(obj_dir):
226226
mkdir(obj_dir)
227227
# END handle destination directory
228-
# rename onto existing doesn't work on windows
229-
if os.name == 'nt':
230-
if isfile(obj_path):
231-
remove(tmp_path)
232-
else:
233-
rename(tmp_path, obj_path)
234-
# end rename only if needed
228+
# rename onto existing doesn't work on NTFS
229+
if isfile(obj_path):
230+
remove(tmp_path)
235231
else:
236232
rename(tmp_path, obj_path)
237-
# END handle win32
233+
# end rename only if needed
238234

239235
# make sure its readable for all ! It started out as rw-- tmp file
240236
# but needs to be rwrr

Diff for: gitdb/db/pack.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
)
1919

2020
from gitdb.pack import PackEntity
21-
from gitdb.utils.compat import xrange
2221

2322
from functools import reduce
2423

@@ -107,7 +106,7 @@ def sha_iter(self):
107106
for entity in self.entities():
108107
index = entity.index()
109108
sha_by_index = index.sha
110-
for index in xrange(index.size()):
109+
for index in range(index.size()):
111110
yield sha_by_index(index)
112111
# END for each index
113112
# END for each entity

Diff for: gitdb/ext/smmap

Submodule smmap updated from 91d506e to a0060cf

0 commit comments

Comments
 (0)