diff --git a/Makefile b/Makefile index ae74a0d80..c963dd7e6 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ release: clean force_release: clean git push --tags origin master python3 setup.py sdist bdist_wheel - twine upload -s -i byronimo@gmail.com dist/* + twine upload -s -i 763629FEC8788FC35128B5F6EE029D1E5EB40300 dist/* docker-build: docker build --quiet -t gitpython:xenial -f Dockerfile . diff --git a/VERSION b/VERSION index ea4bd0fb3..67da95408 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.13 +2.1.15 diff --git a/doc/source/changes.rst b/doc/source/changes.rst index b9f286384..97ae82d6c 100644 --- a/doc/source/changes.rst +++ b/doc/source/changes.rst @@ -2,6 +2,16 @@ Changelog ========= +2.1.15 - Bugfixes +================= + +Fix requirements.txt formatting and version lock gitdb2 to <3 for Python 2 compatibility. + +2.1.14 - Bugfixes +================= + +Fix an issue with `transforming kwargs `_ passed to the `git` command. + 2.1.13 - Bring back Python 2.7 support ====================================== diff --git a/git/cmd.py b/git/cmd.py index 64c3d480a..50b1e3212 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -893,7 +893,7 @@ def transform_kwarg(self, name, value, split_single_char_options): else: if value is True: return ["--%s" % dashify(name)] - elif value not in (False, None): + elif value is not False and value is not None: return ["--%s=%s" % (dashify(name), value)] return [] diff --git a/git/ext/gitdb b/git/ext/gitdb index c0fd43b5f..e45fd0792 160000 --- a/git/ext/gitdb +++ b/git/ext/gitdb @@ -1 +1 @@ -Subproject commit c0fd43b5ff8c356fcf9cdebbbbd1803a502b4651 +Subproject commit e45fd0792ee9a987a4df26e3139f5c3b107f0092 diff --git a/git/test/test_git.py b/git/test/test_git.py index 30a6a335e..4a189267e 100644 --- a/git/test/test_git.py +++ b/git/test/test_git.py @@ -86,6 +86,7 @@ def test_it_transforms_kwargs_into_git_command_arguments(self): assert_equal(["--max-count"], self.git.transform_kwargs(**{'max_count': True})) assert_equal(["--max-count=5"], self.git.transform_kwargs(**{'max_count': 5})) + assert_equal(["--max-count=0"], self.git.transform_kwargs(**{'max_count': 0})) assert_equal([], self.git.transform_kwargs(**{'max_count': None})) # Multiple args are supported by using lists/tuples diff --git a/requirements.txt b/requirements.txt index 63d5ddfe7..d312d11bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -gitdb2 (>=2.0.0) +gitdb2>=2,<3 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy