Skip to content

Commit

Permalink
chore(ver): bump 2.0.0.dev1-->2.1.0.dev3, and more
Browse files Browse the repository at this point in the history
+ chore(deps): 
  + smmap2-v2.1.0.dev4 (FIXes memoryview leak).
  + FIX quoted environment marker in requirements.
  + import actually smmap2!
  • Loading branch information
ankostis committed Oct 27, 2016
1 parent 40199ba commit bc65c8d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion gitdb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
__author__ = "Sebastian Thiel"
__contact__ = "[email protected]"
__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)


Expand Down
5 changes: 0 additions & 5 deletions gitdb/test/test_pack.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,6 @@ def test_pack(self):
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 = []
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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/[email protected].dev1#egg=smmap
## DEV-requirement: FIX memleak (FIXME: remove on release)
-e git+https://github.com/ankostis/[email protected].dev4#egg=smmap2
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
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.1.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=[
Expand Down

0 comments on commit bc65c8d

Please sign in to comment.