Skip to content

Commit e8e009d

Browse files
authored
Merge pull request #46 from hugovk/rm-eol
Drop support for EOL Python
2 parents 3e71833 + 186db66 commit e8e009d

File tree

6 files changed

+6
-12
lines changed

6 files changed

+6
-12
lines changed

Diff for: .travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: python
22
python:
3-
- "2.6"
43
- "2.7"
5-
- "3.3"
64
- "3.4"
75
- "3.5"
86
- "3.6"

Diff for: gitdb/db/pack.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def update_cache(self, force=False):
148148
# packs are supposed to be prefixed with pack- by git-convention
149149
# get all pack files, figure out what changed
150150
pack_files = set(glob.glob(os.path.join(self.root_path(), "pack-*.pack")))
151-
our_pack_files = set(item[1].pack().path() for item in self._entities)
151+
our_pack_files = {item[1].pack().path() for item in self._entities}
152152

153153
# new packs
154154
for pack_file in (pack_files - our_pack_files):

Diff for: gitdb/db/ref.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def _update_dbs_from_ref_file(self):
4949
# END handle alternates
5050

5151
ref_paths_set = set(ref_paths)
52-
cur_ref_paths_set = set(db.root_path() for db in self._dbs)
52+
cur_ref_paths_set = {db.root_path() for db in self._dbs}
5353

5454
# remove existing
5555
for path in (cur_ref_paths_set - ref_paths_set):

Diff for: gitdb/test/lib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def wrapper(self):
8686
try:
8787
return func(self, path)
8888
except Exception:
89-
sys.stderr.write("Test %s.%s failed, output is at %r\n" % (type(self).__name__, func.__name__, path))
89+
sys.stderr.write("Test {}.{} failed, output is at {!r}\n".format(type(self).__name__, func.__name__, path))
9090
keep = True
9191
raise
9292
finally:

Diff for: gitdb/util.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919

2020
# initialize our global memory manager instance
2121
# Use it to free cached (and unused) resources.
22-
if sys.version_info < (2, 6):
23-
mman = StaticWindowMapManager()
24-
else:
25-
mman = SlidingWindowMapManager()
22+
mman = SlidingWindowMapManager()
2623
# END handle mman
2724

2825
import hashlib

Diff for: setup.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
zip_safe=False,
2323
install_requires=['smmap2 >= 2.0.0'],
2424
long_description="""GitDB is a pure-Python git object database""",
25+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
2526
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
2627
classifiers=[
2728
"Development Status :: 5 - Production/Stable",
@@ -34,12 +35,10 @@
3435
"Operating System :: MacOS :: MacOS X",
3536
"Programming Language :: Python",
3637
"Programming Language :: Python :: 2",
37-
"Programming Language :: Python :: 2.6",
3838
"Programming Language :: Python :: 2.7",
3939
"Programming Language :: Python :: 3",
40-
"Programming Language :: Python :: 3.2",
41-
"Programming Language :: Python :: 3.3",
4240
"Programming Language :: Python :: 3.4",
4341
"Programming Language :: Python :: 3.5",
42+
"Programming Language :: Python :: 3.6",
4443
]
4544
)

0 commit comments

Comments
 (0)