Skip to content

Drop support for EOL Python #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: python
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
Expand Down
2 changes: 1 addition & 1 deletion gitdb/db/pack.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def update_cache(self, force=False):
# packs are supposed to be prefixed with pack- by git-convention
# get all pack files, figure out what changed
pack_files = set(glob.glob(os.path.join(self.root_path(), "pack-*.pack")))
our_pack_files = set(item[1].pack().path() for item in self._entities)
our_pack_files = {item[1].pack().path() for item in self._entities}

# new packs
for pack_file in (pack_files - our_pack_files):
Expand Down
2 changes: 1 addition & 1 deletion gitdb/db/ref.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def _update_dbs_from_ref_file(self):
# END handle alternates

ref_paths_set = set(ref_paths)
cur_ref_paths_set = set(db.root_path() for db in self._dbs)
cur_ref_paths_set = {db.root_path() for db in self._dbs}

# remove existing
for path in (cur_ref_paths_set - ref_paths_set):
Expand Down
2 changes: 1 addition & 1 deletion gitdb/test/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def wrapper(self):
try:
return func(self, path)
except Exception:
sys.stderr.write("Test %s.%s failed, output is at %r\n" % (type(self).__name__, func.__name__, path))
sys.stderr.write("Test {}.{} failed, output is at {!r}\n".format(type(self).__name__, func.__name__, path))
keep = True
raise
finally:
Expand Down
5 changes: 1 addition & 4 deletions gitdb/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@

# initialize our global memory manager instance
# Use it to free cached (and unused) resources.
if sys.version_info < (2, 6):
mman = StaticWindowMapManager()
else:
mman = SlidingWindowMapManager()
mman = SlidingWindowMapManager()
# END handle mman

import hashlib
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
zip_safe=False,
install_requires=['smmap2 >= 2.0.0'],
long_description="""GitDB is a pure-Python git object database""",
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand All @@ -34,12 +35,10 @@
"Operating System :: MacOS :: MacOS X",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.2",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
]
)