summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-10-27 11:45:51 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-10-27 14:57:11 +0200
commitfa89615868888fe656ba7bdda2a2fb4baa701349 (patch)
treeb2da4769e8f41156c05bb37c555c8cffb9009c51
parent40199bad6862f21527c322f41653179c700edea3 (diff)
downloadgitdb-2.1.0.dev3.tar.gz
chore(ver): bump 2.0.0.dev1-->2.1.0.dev3, and morev2.1.0.dev3
+ chore(deps): + smmap2-v2.1.0.dev4 (FIXes memoryview leak). + FIX quoted environment marker in requirements. + import actually smmap2!
-rw-r--r--gitdb/__init__.py2
-rw-r--r--gitdb/test/test_pack.py5
-rw-r--r--requirements.txt8
-rwxr-xr-xsetup.py6
4 files changed, 7 insertions, 14 deletions
diff --git a/gitdb/__init__.py b/gitdb/__init__.py
index 33229ce..9244074 100644
--- a/gitdb/__init__.py
+++ b/gitdb/__init__.py
@@ -10,7 +10,7 @@ import os
__author__ = "Sebastian Thiel"
__contact__ = "byronimo@gmail.com"
__homepage__ = "https://github.com/gitpython-developers/gitdb"
-version_info = (2, 1, 0, 'dev1')
+version_info = (2, 1, 0, 'dev3')
__version__ = '.'.join(str(i) for i in version_info)
diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
index 5efe80c..f1e885b 100644
--- a/gitdb/test/test_pack.py
+++ b/gitdb/test/test_pack.py
@@ -139,11 +139,6 @@ class TestPack(TestBase):
self._assert_pack_file(pack, version, size)
# END for each pack to test
- ## Unless HIDE_WINDOWS_KNOWN_ERRORS, on Windows fails with:
- # File "D:\Work\gitdb.git\gitdb\util.py", line 141, in onerror
- # func(path) # Will scream if still not possible to delete.
- # PermissionError: [WinError 32] The process cannot access the file
- # because it is being used by another process: 'sss\\index_cc_wll5'
@with_rw_directory
def test_pack_entity(self, rw_dir):
pack_objs = []
diff --git a/requirements.txt b/requirements.txt
index 39cb6a3..b74364a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-contextlib2; python_version <= "2.7"
-#smmap>=2.1.0
+contextlib2; python_version<='2.7'
+#smmap2>=2.1.0
-## DEV-requirements (FIXME: remove on release)
--e git+https://github.com/ankostis/smmap.git@v2.1.0.dev1#egg=smmap
+## DEV-requirement: FIX memleak (FIXME: remove on release)
+-e git+https://github.com/ankostis/smmap.git@v2.1.0.dev4#egg=smmap2
diff --git a/setup.py b/setup.py
index 8f35112..84128fe 100755
--- a/setup.py
+++ b/setup.py
@@ -20,10 +20,8 @@ setup(
packages=('gitdb', 'gitdb.db', 'gitdb.utils', 'gitdb.test'),
license="BSD License",
zip_safe=False,
- install_requires=['smmap2 >= 2.1.0'],
- extras_require={
- ':python_version <= "2.7"': ['contextlib2'],
- },
+ install_requires=['smmap2 >= 2.0.0'],
+ extras_require={':python_version=="2.7"': ['contextlib2']},
long_description="""GitDB is a pure-Python git object database""",
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=[