summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-22 18:56:28 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-22 18:56:28 +0100
commitf3d91ca75500285d19c6ae2d4bf018452ad822a6 (patch)
tree475b57fcdb557f9d081d5473e8bb34e2baaed3ff
parentffefb154982c6cc47c9be6b3eae6fb1170bb0791 (diff)
downloadgitpython-f3d91ca75500285d19c6ae2d4bf018452ad822a6.tar.gz
Bumped version to 0.3.6
Unfortunately, installation of a executable script has proven to be so difficult thanks setuptools gloriousness, which will force me to remove that feature
-rw-r--r--MANIFEST.in2
-rw-r--r--VERSION2
-rw-r--r--git/test/test_repo.py7
-rwxr-xr-xsetup.py2
4 files changed, 4 insertions, 9 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 4c02e39a..028d3619 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,7 @@ include CHANGES
include AUTHORS
include README
include requirements.txt
-include scripts/ssh_wrapper.py
+include git/scripts/ssh_wrapper.sh
graft git/test/fixtures
graft git/test/performance
diff --git a/VERSION b/VERSION
index c2c0004f..449d7e73 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.5
+0.3.6
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index ea491824..667ede74 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -34,10 +34,7 @@ from git.repo.fun import touch
from git.util import join_path_native
from git.exc import BadObject
from gitdb.util import bin_to_hex
-from git.compat import (
- string_types,
- # PY3
-)
+from git.compat import string_types
from gitdb.test.lib import with_rw_directory
import os
@@ -615,7 +612,6 @@ class TestRepo(TestBase):
# END handle multiple tokens
# try partial parsing
- # if not (PY3 and 'TRAVIS' in os.environ):
max_items = 40
for i, binsha in enumerate(self.rorepo.odb.sha_iter()):
assert rev_parse(bin_to_hex(binsha)[:8 - (i % 2)].decode('ascii')).binsha == binsha
@@ -624,7 +620,6 @@ class TestRepo(TestBase):
# which requires accessing packs, it has some additional overhead
break
# END for each binsha in repo
- # end travis special handling
# missing closing brace commit^{tree
self.failUnlessRaises(ValueError, rev_parse, '0.1.4^{tree')
diff --git a/setup.py b/setup.py
index d35301ae..d2d8f2fa 100755
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,7 @@ setup(
url="https://github.com/gitpython-developers/GitPython",
packages=find_packages('.'),
py_modules=['git.' + f[:-3] for f in os.listdir('./git') if f.endswith('.py')],
- package_data={'git.test': ['fixtures/*']},
+ package_data={'git.test': ['fixtures/*'], 'git' : ['scripts/*']},
package_dir={'git': 'git'},
license="BSD License",
requires=['gitdb (>=0.6.4)'],